SF.net SVN: geany:[4694] branches/sm

[statc at users.sourceforge.net]

Revision: 4694
          http://geany.svn.sourceforge.net/geany/?rev=4694&view=rev
Author:   statc
Date:     2010-02-22 22:12:25 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
Fix opening project in already running instance (via socket).

Modified Paths:
--------------
    branches/sm/ChangeLog
    branches/sm/src/socket.c

Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog	2010-02-22 22:11:54 UTC (rev 4693)
+++ branches/sm/ChangeLog	2010-02-22 22:12:25 UTC (rev 4694)
@@ -4,6 +4,8 @@
    Use a separate command-line option to specify a project to be opened.
  * src/sm.c:
    Remember opened project across restarts.
+ * src/socket.c:
+   Fix opening project in already running instance (via socket).
 
 
 2010-02-15  Eugene Arshinov  <earshinov(at)gmail(dot)com>

Modified: branches/sm/src/socket.c
===================================================================
--- branches/sm/src/socket.c	2010-02-22 22:11:54 UTC (rev 4693)
+++ branches/sm/src/socket.c	2010-02-22 22:12:25 UTC (rev 4694)
@@ -87,6 +87,7 @@
 #include "ui_utils.h"
 #include "utils.h"
 #include "encodings.h"
+#include "project.h"
 
 
 
@@ -517,7 +518,10 @@
 	if (locale_filename)
 	{
 		if (project)
-			main_load_project_from_command_line(locale_filename, TRUE);
+		{
+			if (project_ask_close())
+				main_load_project_from_command_line(locale_filename, TRUE);
+		}
 		else
 			main_handle_filename(locale_filename);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.