comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-22 03:36:24 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #437 from vsonnier/fix_new_session_file_crash

Browse Source 
FIX: saved or created session files in v0.2.0 crashes on reload
This commit is contained in:
Charles J. Cliffe 2016-09-03 08:47:42 -04:00 committed by GitHub
commit 239f3924a8
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/AppFrame.cpp
View File

@ -1633,7 +1633,9 @@ void AppFrame::OnUnSplit(wxSplitterEvent& event)
void AppFrame::saveSession(std::string fileName) { void AppFrame::saveSession(std::string fileName) {
DataTree s("cubicsdr_session"); DataTree s("cubicsdr_session");
DataNode *header = s.rootNode()->newChild("header"); DataNode *header = s.rootNode()->newChild("header");
*header->newChild("version") = std::string(CUBICSDR_VERSION); //save as wstring to prevent problems
header->newChild("version")->element()->set(wxString(CUBICSDR_VERSION).ToStdWstring());
*header->newChild("center_freq") = wxGetApp().getFrequency(); *header->newChild("center_freq") = wxGetApp().getFrequency();
*header->newChild("sample_rate") = wxGetApp().getSampleRate(); *header->newChild("sample_rate") = wxGetApp().getSampleRate();
@ -1711,8 +1713,20 @@ bool AppFrame::loadSession(std::string fileName) {
DataNode *header = l.rootNode()->getNext("header"); DataNode *header = l.rootNode()->getNext("header");
if (header->hasAnother("version")) { if (header->hasAnother("version")) {
std::string version(*header->getNext("version")); //"Force" the retreiving of the value as string, even if its look like a number internally ! (ex: "0.2.0")
// std::cout << "Loading " << version << " session file" << std::endl; DataNode *versionNode = header->getNext("version");
std::wstring version;
try {
versionNode->element()->get(version);
std::cout << "Loading session file version: '" << version << "'..." << std::endl;
}
catch (DataTypeMismatchException* e) {
//this is for managing the old session format NOT encoded as std:wstring,
//force current version
std::cout << "Warning while Loading session file version, probably old format :'" << e->what() << "' please consider re-saving the current session..." << std::endl;
version = wxString(CUBICSDR_VERSION).ToStdWstring();
}
} }
if (header->hasAnother("sample_rate")) { if (header->hasAnother("sample_rate")) {