From a1c5c899cd1010db56c9fe35be716fbc7236f447 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 22 Sep 2013 10:48:53 +0000 Subject: fixed reading strings from db git-svn-id: http://svn.miranda-ng.org/main/trunk@6178 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SplashScreen/src/main.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'plugins/SplashScreen/src/main.cpp') diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 72a827901f..4dc31a6f1d 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -113,27 +113,22 @@ void SplashMain() } } - //for 9x "alfa" testing DBVARIANT dbv = {0}; - db_get_ts(NULL, MODNAME, "VersionPrefix", &dbv); - if (lstrcmp(dbv.ptszVal, NULL) == 0) + if (!db_get_ts(NULL, MODNAME, "VersionPrefix", &dbv)) { - _tcscpy_s(szPrefix, _T("")); + _tcscpy_s(szPrefix, dbv.ptszVal); db_free(&dbv); } else - _tcscpy_s(szPrefix, dbv.ptszVal); - dbv.ptszVal = NULL; + _tcscpy_s(szPrefix, _T("")); - db_get_ts(NULL, MODNAME, "Path", &dbv); - if (lstrcmp(dbv.ptszVal, NULL) == 0) + if (!db_get_ts(NULL, MODNAME, "Path", &dbv)) { - _tcscpy_s(inBuf, _T("splash\\splash.png")); + _tcscpy_s(inBuf, dbv.ptszVal); db_free(&dbv); } else - _tcscpy_s(inBuf, dbv.ptszVal); - dbv.ptszVal = NULL; + _tcscpy_s(inBuf, _T("splash\\splash.png")); TCHAR szExpandedSplashFile[MAX_PATH]; ExpandEnvironmentStrings(inBuf, szExpandedSplashFile, SIZEOF(szExpandedSplashFile)); @@ -146,14 +141,13 @@ void SplashMain() else _tcscpy_s(szSplashFile, inBuf); - db_get_ts(NULL, MODNAME, "Sound", &dbv); - if (lstrcmp(dbv.ptszVal, NULL) == 0) + if (!db_get_ts(NULL, MODNAME, "Sound", &dbv)) { - _tcscpy_s(inBuf, _T("sounds\\startup.wav")); + _tcscpy_s(inBuf, dbv.ptszVal); db_free(&dbv); } else - _tcscpy_s(inBuf, dbv.ptszVal); + _tcscpy_s(inBuf, _T("sounds\\startup.wav")); TCHAR szExpandedSoundFile[MAX_PATH]; ExpandEnvironmentStrings(inBuf, szExpandedSoundFile, SIZEOF(szExpandedSoundFile)); -- cgit v1.2.3