Merge branch 'master' of https://gitea.ublinux.ru/YanTheKaller/ubl-settings-bootloader

Makefile

@@ -11,7 +11,7 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.h
+FILE_VER = source/${PKGNAME}.cc
 PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all
@@ -72,7 +72,6 @@ check:
 build: depend prepare
 	@echo "Build ..."; \
 	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
-	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	echo "Build: OK"
 
 uninstall:
@@ -148,6 +147,7 @@ clean:
 	@if [ -d ${CMAKE_BUILD_DIR} ]; then \
 	    echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
 	else \
+	    sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	    echo "Clean: OK"; \
 	fi
 

source/save.cc

@@ -25,7 +25,7 @@ void Save::set_data_gui(std::map <string, string> &map_gui) {
 bool Save::check_save(string flag_save, string key_name) {
     std::map <string, string>:: iterator iter_map_data;
     std::map <string, string>:: iterator iter_map_data_old;
-    std::map <string, string> *map_data_old;
+    std::map <string, string> *map_data_old=NULL;
     if (flag_save == "system") {
         map_data_old = map_local;
     }

source/ubl-settings-bootloader.cc

@@ -9,7 +9,7 @@ bool flag_save_local = false;
 bool flag_save_global = false;
 bool flag_load_global = false;
 bool flag_lock_help = false;
-string version_application = "2.3";
+string version_application = "2.10";
 
 MainWindow* obj_main;
 void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {

source/util.cc

@@ -258,6 +258,7 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
 
     void yon_window_config_save();
     void yon_window_config_save(){
+        if (__yon_window_config_path){
             g_key_file_set_integer(__yon_window_config_file,"window","WindowPosX",__yon_main_window_config.x);
             g_key_file_set_integer(__yon_window_config_file,"window","WindowPosY",__yon_main_window_config.y);
             g_key_file_set_integer(__yon_window_config_file,"window","WindowWidth",__yon_main_window_config.width);
@@ -309,6 +310,7 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
             
             g_key_file_save_to_file(__yon_window_config_file,__yon_window_config_path,NULL);
         }
+    }
 
     void yon_get_is_fullscreen();
     void yon_get_is_fullscreen(){
@@ -358,6 +360,8 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
     }
     
     int yon_window_config_load(char *path){
+        if(__yon_window_config_target_window){
+            if (!access(path,0)){
                 __yon_window_config_file = g_key_file_new();
                 __yon_window_config_path=yon_char_new(path);
                 if (!g_key_file_load_from_file(__yon_window_config_file,__yon_window_config_path,G_KEY_FILE_NONE,NULL)){
@@ -411,6 +415,9 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
 
                 return 1;
             }
+        }
+        return 0;
+    }
 
 void yon_window_config_apply();
     void yon_window_config_apply(){