diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp
index 0199bc779..bc251f253 100644
--- a/src/gui/adzap.cpp
+++ b/src/gui/adzap.cpp
@@ -66,15 +66,16 @@ CAdZapMenu::CAdZapMenu()
 
 	sem_init(&sem, 0, 0);
 
+	channelId = -1;
+	armed = false;
+	monitor = false;
+	alerted = false;
+
 	pthread_t thr;
 	if (pthread_create(&thr, 0, CAdZapMenu::Run, this))
 		fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n");
 	else
 		pthread_detach(thr);
-	channelId = -1;
-	armed = false;
-	monitor = false;
-	alerted = false;
 }
 
 static bool sortByDateTime(const CChannelEvent & a, const CChannelEvent & b)
diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index 5c17e517d..51b2bb0e2 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -174,7 +174,7 @@ void* CScreenSaver::ScreenSaverPrg(void* arg)
 
 	if (g_settings.screensaver_timeout)
 	{
-		while(1)
+		while(PScreenSaver)
 		{
 			PScreenSaver->paint();
 			sleep(g_settings.screensaver_timeout);