X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=c8f9e60a82f56fb195053a5f46e0259f689d5ef8;hb=59144affebb7b33c5380f03b652ef335d1d6118f;hp=22c49793016f512adc7231f8d47872c4589e2492;hpb=0bef8700f21b9e7898f1785ee654d4669d0117b4;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 22c4979..c8f9e60 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1177,6 +1177,14 @@ load_modules(struct ivi_compositor *ivi, const char *modules,
 			continue;
 		}
 
+		if (strstr(buffer, "systemd-notify.so")) {
+			weston_log("systemd-notify plug-in already loaded!\n");
+			p = end;
+			while (*p == ',')
+				p++;
+			continue;
+		}
+
 		module_init = weston_load_module(buffer, "wet_module_init");
 		if (!module_init)
 			return -1;
@@ -1240,7 +1248,7 @@ compositor_init_config(struct weston_compositor *compositor,
 				      &compositor->kb_repeat_delay, 400);
 
 	weston_config_section_get_bool(section, "vt-switching",
-				       &vt_switching, true);
+				       &vt_switching, false);
 	compositor->vt_switching = vt_switching;
 
 	/* agl-compositor.ini [core] */