mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mixer: Fix opening project by relative pathname on commandline.

This commit is contained in:
Jonathan Moore Liles 2013-08-23 17:05:23 -07:00
parent 4bda8db1fd
commit 4c5551ad8e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mixer/src/Mixer.C
View File

@ -1131,12 +1131,15 @@ Mixer::command_load ( const char *path, const char *display_name )
{ {
mixer->deactivate(); mixer->deactivate();
chdir( path );
load_project_settings();
Project::close(); 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 ) ) if ( Project::open( path ) )
{ {
// fl_alert( "Error opening project specified on commandline: %s", Project::errstr( err ) ); // fl_alert( "Error opening project specified on commandline: %s", Project::errstr( err ) );

6
mixer/src/Project.C
View File

@ -272,10 +272,10 @@ Project::open ( const char *name )
else else
*_created_on = 0; *_created_on = 0;
set_name( name );
*_path = '\0'; getcwd( _path, sizeof( _path ) );
fl_filename_absolute( _path, sizeof( _path ), "." );
set_name( _path );
_is_open = true; _is_open = true;