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

source/CMakeLists.txt

@@ -64,7 +64,6 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wformat -Werror=format-security \
@@ -76,11 +75,17 @@ if(FORTIFY_FOUND EQUAL -1)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
 endif()
         
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+
+if(FORTIFY_FOUND EQUAL -1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+endif()
+
 set(SOURCE_FILES
         ubl-settings-kernel.c
         ubl-settings-kernel.h
         ubl-strings.h
-        )
+)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
@@ -90,7 +95,8 @@ set(LIBRARIES
         pthread
         ublsettings
         ublsettings-gtk3
-        ublsettingsui-gtk3)
+        ublsettingsui-gtk3
+)
 
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})

source/ubl-settings-kernel.c

@@ -614,7 +614,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
         char *target = yon_package_string_set(tab->module);
         char *command = remove_command(target);
         char *command_unload = unload_command(target);
-        system(yon_debug_output("%s\n",command_unload));
+        if (system(yon_debug_output("%s\n",command_unload))){};
         g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_module_remove_done),tab);
         yon_command_execute_async(command,widgets);
         tab->module_installed=0;