about summary refs log tree commit diff
path: root/libnm-util/nm-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-04 22:36:17 +0200
committerMichael Biebl <biebl@debian.org>2011-04-04 22:36:17 +0200
commitc08b7f120a78b1be36e15d2d5fa2b05637f56b92 (patch)
treebbdc1f76b481f8a0d7e329472a415863187b53e6 /libnm-util/nm-utils.c
parentcc5124a8a78d6854e630cb69322abd4d38011e2b (diff)
parentc980bdf58dc973dd5617aaa6f9466f9e44fcbf58 (diff)
Merge commit 'upstream/0.8.3.999'
Diffstat (limited to 'libnm-util/nm-utils.c')
-rw-r--r--libnm-util/nm-utils.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 9c3662f4..7f40fc7e 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -272,13 +272,12 @@ gboolean
 nm_utils_init (GError **error)
 {
 	if (!initialized) {
+		initialized = TRUE;
+
 		if (!crypto_init (error))
 			return FALSE;
 
 		_nm_utils_register_value_transformations ();
-
-		atexit (nm_utils_deinit);
-		initialized = TRUE;
 	}
 	return TRUE;
 }