Branch: refs/heads/master Author: Eugene Arshinov earshinov@gmail.com Committer: Colomban Wendling ban@herbesfolles.org Date: Sun, 18 Mar 2012 14:45:41 Commit: f4afe96880ed01b4ecb6ffe32e10c34e2b661399 https://github.com/geany/geany/commit/f4afe96880ed01b4ecb6ffe32e10c34e2b6613...
Log Message: ----------- Fix opening project in already running instance (via socket).
Previously the code didn't properly handle the case when other project is already opened.
Modified Paths: -------------- src/socket.c
Modified: src/socket.c 7 files changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -86,7 +86,7 @@ #include "utils.h" #include "dialogs.h" #include "encodings.h" - +#include "project.h"
#ifdef G_OS_WIN32 @@ -563,7 +563,10 @@ static void handle_input_filename(const gchar *buf) if (locale_filename) { if (g_str_has_suffix(locale_filename, ".geany")) - 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 E-Mail was brought to you by github_commit_mail.py (Source: TBD).