diff --git a/src/ngscopeclient/MainWindow.cpp b/src/ngscopeclient/MainWindow.cpp index f3187ffcd..1f095a0cb 100644 --- a/src/ngscopeclient/MainWindow.cpp +++ b/src/ngscopeclient/MainWindow.cpp @@ -2306,8 +2306,8 @@ bool MainWindow::LoadDialogs(const YAML::Node& node) m_session.AddMultimeterDialog(meter); else { - ShowErrorPopup("Invalid meter", "Multimeter could not be loaded"); - return false; + ShowErrorPopup("Invalid meter", "Multimeter dialog references nonexistent instrument"); + continue; } } } @@ -2324,8 +2324,8 @@ bool MainWindow::LoadDialogs(const YAML::Node& node) AddDialog(make_shared(gen, &m_session)); else { - ShowErrorPopup("Invalid function generator", "Function generator could not be loaded"); - return false; + ShowErrorPopup("Invalid function generator", "Function generator dialog references nonexistent instrument"); + continue; } } } @@ -2342,8 +2342,8 @@ bool MainWindow::LoadDialogs(const YAML::Node& node) AddDialog(make_shared(psu, m_session.GetPSUState(psu), &m_session)); else { - ShowErrorPopup("Invalid PSU", "PSU could not be loaded"); - return false; + ShowErrorPopup("Invalid PSU", "PSU dialog references nonexistent instrument"); + continue; } } } @@ -2360,8 +2360,8 @@ bool MainWindow::LoadDialogs(const YAML::Node& node) AddDialog(make_shared(bert, m_session.GetBERTState(bert), &m_session)); else { - ShowErrorPopup("Invalid BERT", "BERT could not be loaded"); - return false; + ShowErrorPopup("Invalid BERT", "BERT dialog references nonexistent instrument"); + continue; } } } @@ -2378,8 +2378,8 @@ bool MainWindow::LoadDialogs(const YAML::Node& node) AddDialog(make_shared(load, m_session.GetLoadState(load), &m_session)); else { - ShowErrorPopup("Invalid load", "Load could not be loaded"); - return false; + ShowErrorPopup("Invalid load", "Load dialog references nonexistent instrument"); + continue; } } } diff --git a/src/ngscopeclient/Session.cpp b/src/ngscopeclient/Session.cpp index c7bbefd30..da51aa10b 100644 --- a/src/ngscopeclient/Session.cpp +++ b/src/ngscopeclient/Session.cpp @@ -1023,8 +1023,8 @@ bool Session::PreLoadLoad(int version, const YAML::Node& node, bool online) node["args"].as() ); */ - LogError("offline loading of loads not implemented yet"); - return false; + LogError("offline loading of loads not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1098,8 +1098,8 @@ bool Session::PreLoadMisc(int version, const YAML::Node& node, bool online) node["args"].as() ); */ - LogError("offline loading of misc instruments not implemented yet"); - return false; + LogError("offline loading of misc instruments not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1173,8 +1173,8 @@ bool Session::PreLoadBERT(int version, const YAML::Node& node, bool online) node["args"].as() ); */ - LogError("offline loading of BERTs not implemented yet"); - return false; + LogError("offline loading of BERTs not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1248,8 +1248,8 @@ bool Session::PreLoadMultimeter(int version, const YAML::Node& node, bool online node["args"].as() ); */ - LogError("offline loading of multimeters not implemented yet"); - return false; + LogError("offline loading of multimeters not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1323,8 +1323,8 @@ bool Session::PreLoadPowerSupply(int version, const YAML::Node& node, bool onlin node["args"].as() ); */ - LogError("offline loading of power supplies not implemented yet"); - return false; + LogError("offline loading of power supplies not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1398,8 +1398,8 @@ bool Session::PreLoadRFSignalGenerator(int version, const YAML::Node& node, bool node["args"].as() ); */ - LogError("offline loading of RF generators not implemented yet"); - return false; + LogError("offline loading of RF generators not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings @@ -1473,8 +1473,8 @@ bool Session::PreLoadFunctionGenerator(int version, const YAML::Node& node, bool node["args"].as() ); */ - LogError("offline loading of function generators not implemented yet"); - return false; + LogError("offline loading of function generators not implemented yet\n"); + return true; } //Make any config settings to the instrument from our preference settings