From 2b08c5d248f75738f9b65851fd002ea9976f26c0 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Sat, 10 Oct 2015 01:13:48 -0400
Subject: [PATCH] Fixed and working with MSVC 32-bit

---
 .gitignore       | 1 +
 src/AppFrame.cpp | 6 ++++--
 src/CubicSDR.cpp | 6 +++++-
 src/CubicSDR.h   | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18333cf..9705193 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+build/
 cmake_build/
 cmake_build_msvc/
 dist/
diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index dae5a3d..662d882 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -802,8 +802,10 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
         if (!demodTuner->HasFocus()) {
             demodTuner->SetFocus();
         }
-    } else if (!waterfallCanvas->HasFocus()) {
-        waterfallCanvas->SetFocus();
+    } else if (!wxGetApp().isDeviceSelectorOpen()) {
+		if (!waterfallCanvas->HasFocus()) {
+			waterfallCanvas->SetFocus();
+		}
     }
 
     scopeCanvas->setPPMMode(demodTuner->isAltDown());
diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
index f8c2230..15e411c 100644
--- a/src/CubicSDR.cpp
+++ b/src/CubicSDR.cpp
@@ -101,9 +101,9 @@ bool CubicSDR::OnInit() {
 //    t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
     sdrEnum = new SDREnumerator();
 
-    t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
 
     appframe = new AppFrame();
+	t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
 
 //#ifdef __APPLE__
 //    int main_policy;
@@ -499,3 +499,7 @@ std::string CubicSDR::getNotification() {
 void CubicSDR::setDeviceSelectorClosed() {
     deviceSelectorOpen.store(false);
 }
+
+bool CubicSDR::isDeviceSelectorOpen() {
+	return deviceSelectorOpen.load();
+}
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index c942dbf..f892fdd 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -100,6 +100,7 @@ public:
     void removeRemote(std::string remoteAddr);
 
     void setDeviceSelectorClosed();
+	bool isDeviceSelectorOpen();
     
 private:
     AppFrame *appframe;