[geany/geany] 96e263: Merge pull request #431 from techee/absolute_prjname

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 04 Mar 2015 14:04:34 UTC
Commit:      96e2635abe86f855c8173eba57e7701a120807b9
             https://github.com/geany/geany/commit/96e2635abe86f855c8173eba57e7701a120807b9

Log Message:
-----------
Merge pull request #431 from techee/absolute_prjname

Always use absolute path when opening projects from command-line


Modified Paths:
--------------
    src/main.c

Modified: src/main.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -900,11 +900,14 @@ static void load_startup_files(gint argc, gchar **argv)
 
 	if (argc > 1 && g_str_has_suffix(argv[1], ".geany"))
 	{
+		gchar *filename = main_get_argv_filename(argv[1]);
+
 		/* project file specified: load it, but decide the session later */
-		main_load_project_from_command_line(argv[1], FALSE);
+		main_load_project_from_command_line(filename, FALSE);
 		argc--, argv++;
 		/* force session load if using project-based session files */
 		load_session = project_prefs.project_session;
+		g_free(filename);
 	}
 
 	/* Load the default session if:



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).