summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2021-02-01 20:19:41 +0000
committerPascal Terjan <pterjan@mageia.org>2021-02-02 22:15:03 +0000
commit623453d11162f4c05488d4bdec82ce20137b2e05 (patch)
tree8fcd8f326c66a4d8d505c4340c6eec3107830455
parentee05f58fac0515909d5f093b291b3bce07166a8b (diff)
downloadcontrol-center-623453d11162f4c05488d4bdec82ce20137b2e05.tar
control-center-623453d11162f4c05488d4bdec82ce20137b2e05.tar.gz
control-center-623453d11162f4c05488d4bdec82ce20137b2e05.tar.bz2
control-center-623453d11162f4c05488d4bdec82ce20137b2e05.tar.xz
control-center-623453d11162f4c05488d4bdec82ce20137b2e05.zip
Workaround a segfault on exitdistro/mga7
There seems to be some race causing a segfault during cleanup on exit. Prevent it by destroying the window manually earlier (mga#26944).
-rw-r--r--Makefile2
-rw-r--r--NEWS4
-rwxr-xr-xcontrol-center2
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 29591060..197cbf03 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 13.23
+VERSION = 13.23.1
NAME = drakconf
GITNAME = control-center
SUBDIRS = po pixmaps polkit #data
diff --git a/NEWS b/NEWS
index 436461cf..b0b5360d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 13.23.1 - 2 February 2021, by Pascal Terjan
+
+- Workaround a segfault on exit (mga#26944)
+
Version 13.23 - 11 November 2019, by Thomas Backlund
- translation updates
diff --git a/control-center b/control-center
index fe20eb38..60ecafc8 100755
--- a/control-center
+++ b/control-center
@@ -1292,6 +1292,8 @@ sub quit_global() {
WIDTH => $x,
});
gtkset_mousecursor_normal();
+ # Workaround a segfault on exit by manually destroying the window before exit()
+ $window_global->destroy;
standalone::exit(0);
}