From b8cb4f9c9fadef02df760d381d6d0b67bf03524c Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 9 Oct 2015 19:42:52 -0400 Subject: [PATCH] Fix for linux (and possibly windows) startup error --- src/CubicSDR.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp index 5157719..f8c2230 100644 --- a/src/CubicSDR.cpp +++ b/src/CubicSDR.cpp @@ -101,10 +101,10 @@ bool CubicSDR::OnInit() { // t_SDR = new std::thread(&SDRThread::threadMain, sdrThread); sdrEnum = new SDREnumerator(); - appframe = new AppFrame(); - t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum); + appframe = new AppFrame(); + //#ifdef __APPLE__ // int main_policy; // struct sched_param main_param; @@ -226,7 +226,7 @@ void CubicSDR::sdrThreadNotify(SDRThread::SDRThreadState state, std::string mess // info = new wxMessageDialog(NULL, message, wxT("Error initializing device"), wxOK | wxICON_ERROR); // info->ShowModal(); } - appframe->SetStatusText(message); + //if (appframe) { appframe->SetStatusText(message); } notify_busy.unlock(); } @@ -244,7 +244,7 @@ void CubicSDR::sdrEnumThreadNotify(SDREnumerator::SDREnumState state, std::strin notifyMessage = message; sdrEnum->terminate(); } - appframe->SetStatusText(message); + //if (appframe) { appframe->SetStatusText(message); } notify_busy.unlock(); }