]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge branch 'illwieckz/files'
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 30 Jul 2017 04:11:48 +0000 (14:11 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 30 Jul 2017 04:13:32 +0000 (14:13 +1000)
1  2 
CMakeLists.txt
radiant/map.cpp

diff --cc CMakeLists.txt
Simple merge
diff --cc radiant/map.cpp
index bdc7841e3ae292ecf99551dfa41014498963973c,9978092e01472eb37e0841714299931c0bf30bb2..147cfa98762e7842f734be9f8fdedbc02e839b1f
@@@ -1814,7 -1820,7 +1820,7 @@@ const char* map_import( const char* tit
  }
  
  const char* map_save( const char* title ){
-       return file_dialog( GTK_WIDGET( MainFrame_getWindow() ), FALSE, title, getMapsPath(), MapFormat::Name(), false, false, true );
 -      return file_dialog( GTK_WIDGET( MainFrame_getWindow() ), TRUE, title, getLastFolderPath(), MapFormat::Name(), false, true, false );
++      return file_dialog( GTK_WIDGET( MainFrame_getWindow() ), FALSE, title, getLastFolderPath(), MapFormat::Name(), false, false, true );
  }
  
  void OpenMap(){