Merge pull request #51 from beefcurtains/develop

Minor thingies

1 files changed, 5 insertions, 0 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 45cab12f..9785be45 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -13,6 +13,8 @@
 #include <QQueue>
 #include <QCloseEvent>
 #ifdef Q_OS_WIN
+#define WIN32_LEAN_AND_MEAN/*_KILLING_MACHINE*/
+#define WIN32_EXTRA_LEAN
 #include <windows.h>
 #include <winnetwk.h>
 #undef DELETE
@@ -264,6 +266,9 @@ void MainWindow::config() {
     QScopedPointer<Dialog> d(new Dialog(this));
     d->setModal(true);
 
+    // Automatically default to pass if it's available
+    usePass = firstRun ? QFile(passExecutable).exists() : usePass;
+
     d->setPassPath(passExecutable);
     d->setGitPath(gitExecutable);
     d->setGpgPath(gpgExecutable);