Fix for linux (and possibly windows) startup error

This commit is contained in:
Charles J. Cliffe 2015-10-09 19:42:52 -04:00
parent 207d61cd0c
commit b8cb4f9c9f

View File

@ -101,10 +101,10 @@ bool CubicSDR::OnInit() {
// t_SDR = new std::thread(&SDRThread::threadMain, sdrThread); // t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
sdrEnum = new SDREnumerator(); sdrEnum = new SDREnumerator();
appframe = new AppFrame();
t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum); t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
appframe = new AppFrame();
//#ifdef __APPLE__ //#ifdef __APPLE__
// int main_policy; // int main_policy;
// struct sched_param main_param; // 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 = new wxMessageDialog(NULL, message, wxT("Error initializing device"), wxOK | wxICON_ERROR);
// info->ShowModal(); // info->ShowModal();
} }
appframe->SetStatusText(message); //if (appframe) { appframe->SetStatusText(message); }
notify_busy.unlock(); notify_busy.unlock();
} }
@ -244,7 +244,7 @@ void CubicSDR::sdrEnumThreadNotify(SDREnumerator::SDREnumState state, std::strin
notifyMessage = message; notifyMessage = message;
sdrEnum->terminate(); sdrEnum->terminate();
} }
appframe->SetStatusText(message); //if (appframe) { appframe->SetStatusText(message); }
notify_busy.unlock(); notify_busy.unlock();
} }