From 6234ae30aedee812febea6ded7c028448011746a Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Tue, 25 Dec 2012 01:57:50 +0200
Subject: fixed first run bugs

---
 init.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'init.cpp')

diff --git a/init.cpp b/init.cpp
index 1ba5ab1..7a785a7 100755
--- a/init.cpp
+++ b/init.cpp
@@ -97,6 +97,7 @@ void init_vars()
 	bAutoExchange = DBGetContactSettingByte(NULL, szGPGModuleName, "bAutoExchange", 0);
 	password = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
 	debuglog.init();
+	bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false;
 	bJabberAPI = DBGetContactSettingByte(NULL, szGPGModuleName, "bJabberAPI", bIsMiranda09?1:0);
 	bPresenceSigning = DBGetContactSettingByte(NULL, szGPGModuleName, "bPresenceSigning", 0);
 	bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 0);
@@ -202,9 +203,9 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 
 	void InitCheck();
 	void FirstRun();
-	bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false;
 	FirstRun();
-	InitCheck();
+	if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1))
+		InitCheck();
 	InitIconLib();
 	if(ServiceExists(MS_MSG_ADDICON)) 
 	{
-- 
cgit v1.2.3