fix creation of windows registry key on import from GnuPG, if gnupg key doesn't already exist

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@913 34ebc366-c3a9-4b3c-9f84-69acf7962910

1 files changed, 17 insertions, 4 deletions

diff --git a/wizard.cpp b/wizard.cpp
index 5921cda..a7e19e0 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -22,6 +22,10 @@
 
 #include "wizard.h"
 
+#ifdef Q_OS_WIN
+#include "windows.h"
+#endif
+
 Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
     : QWizard(parent)
 {
@@ -316,16 +320,25 @@ void ImportFromGnupgPage::importKeysFromGnupg()
     wizard()->next();
 }
 
+
 QString ImportFromGnupgPage::getGnuPGHome()
 {
     QString gnuPGHome="";
     #ifdef _WIN32
+    bool existsAndSuccess = false;
+
+    HKEY hKey;
+
+    existsAndSuccess = (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\GNU\\GNUPG", 0, KEY_READ, &hKey) == ERROR_SUCCESS);
+
+    if (existsAndSuccess) {
         QSettings gnuPGsettings("HKEY_CURRENT_USER\\Software\\GNU\\GNUPG", QSettings::NativeFormat);
-        gnuPGHome = gnuPGsettings.value("HomeDir").toString();
-        if (gnuPGHome.isEmpty()) {
-            return NULL;
+            if (gnuPGsettings.contains("HomeDir")) {
+                gnuPGHome = gnuPGsettings.value("HomeDir").toString();
+            } else {
+                return NULL;
+            }
         }
-
     #else
         gnuPGHome=QDir::homePath()+"/.gnupg";
         if (! QFile(gnuPGHome).exists()) {