Add saving to last loaded xml settings file

src/Application/Application.cpp

@@ -92,8 +92,7 @@ void Application::onKeyPressed(ofKeyEventArgs & args){
 		 break;
 
 	 case 's':
-		 _surfaceManager.saveXmlSettings(
+		 _surfaceManager.saveXmlSettings(SettingsLoader::instance()->getLastLoadedFilename());
-			 PIMAPPER_USER_SURFACES_XML_FILE);
 		 break;
 
 	 case 'z':

src/Application/SettingsLoader.cpp

@@ -104,6 +104,8 @@ bool SettingsLoader::load(SurfaceStack & surfaces, MediaServer & mediaServer, st
 		xmlSettings->popTag(); // surfaces
 	}
 	
+	_lastLoadedFilename = fileName;
+	
 	return true;
 }
 

src/Application/SettingsLoader.h

@@ -17,12 +17,16 @@ class SettingsLoader {
 		bool load(SurfaceStack & surfaces, MediaServer & mediaServer, string fileName);
 		bool save(SurfaceStack & surfaces, string fileName);
 	
+		string getLastLoadedFilename(){ return _lastLoadedFilename; };
+	
 	private:
 		static SettingsLoader * _instance;
 	
 		BaseSurface * getTriangleSurface(ofxXmlSettings * xmlSettings);
 		BaseSurface * getQuadSurface(ofxXmlSettings * xmlSettings);
 		BaseSurface * getGridWarpSurface(ofxXmlSettings * xmlSettings);
+	
+		string _lastLoadedFilename;
 };
 
 }