From 4c5551ad8ea35d03688e88dc9c8ca6c729a7ba8a Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 23 Aug 2013 17:05:23 -0700 Subject: [PATCH] Mixer: Fix opening project by relative pathname on commandline. --- mixer/src/Mixer.C | 11 +++++++---- mixer/src/Project.C | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C index 8e962b1..2895d47 100644 --- a/mixer/src/Mixer.C +++ b/mixer/src/Mixer.C @@ -1131,11 +1131,14 @@ Mixer::command_load ( const char *path, const char *display_name ) { mixer->deactivate(); - chdir( path ); - - load_project_settings(); - Project::close(); + + char *pwd = (char*)malloc( PATH_MAX + 1 ); + getcwd( pwd, PATH_MAX ); + chdir( path ); + load_project_settings(); + chdir( pwd ); + free( pwd ); if ( Project::open( path ) ) { diff --git a/mixer/src/Project.C b/mixer/src/Project.C index acd50fa..2ba92cf 100644 --- a/mixer/src/Project.C +++ b/mixer/src/Project.C @@ -272,10 +272,10 @@ Project::open ( const char *name ) else *_created_on = 0; - set_name( name ); - *_path = '\0'; - fl_filename_absolute( _path, sizeof( _path ), "." ); + getcwd( _path, sizeof( _path ) ); + + set_name( _path ); _is_open = true;