From 49106d8845cda5f60d5a00d1f4a1fbc6d791a50e Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 7 Feb 2012 13:37:44 +0100 Subject: [PATCH] core: fix singleton handling in NULL/systemd session monitor --- src/nm-session-monitor-null.c | 4 +++- src/nm-session-monitor-systemd.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nm-session-monitor-null.c b/src/nm-session-monitor-null.c index ec33bef62d..14d756fe2d 100644 --- a/src/nm-session-monitor-null.c +++ b/src/nm-session-monitor-null.c @@ -84,7 +84,9 @@ nm_session_monitor_get (void) if (singleton) return g_object_ref (singleton); - return NM_SESSION_MONITOR (g_object_new (NM_TYPE_SESSION_MONITOR, NULL)); + singleton = NM_SESSION_MONITOR (g_object_new (NM_TYPE_SESSION_MONITOR, NULL)); + assert (singleton); + return singleton; } /* ---------------------------------------------------------------------------------------------------- */ diff --git a/src/nm-session-monitor-systemd.c b/src/nm-session-monitor-systemd.c index ae0949469d..8fe73ae56b 100644 --- a/src/nm-session-monitor-systemd.c +++ b/src/nm-session-monitor-systemd.c @@ -195,7 +195,9 @@ nm_session_monitor_get (void) if (singleton) return g_object_ref (singleton); - return NM_SESSION_MONITOR (g_object_new (NM_TYPE_SESSION_MONITOR, NULL)); + singleton = NM_SESSION_MONITOR (g_object_new (NM_TYPE_SESSION_MONITOR, NULL)); + assert (singleton); + return singleton; } gboolean