fly/flightgear
1
0
Fork 0
Code Activity

- catch sg_exception instead of sg_io_exception

Browse source 
- use guiErrorMessage
This commit is contained in:
curt 2001-07-24 23:50:08 +00:00
parent 43cf7b07fd
commit ddbd85aa7b
3 changed files with 10 additions and 33 deletions

18
src/Cockpit/hud.cxx
View file

@ -648,13 +648,8 @@ int readHud( istream &input )
try { try {
readProperties(input, &root); readProperties(input, &root);
} catch (const sg_io_exception &e) { } catch (const sg_exception &e) {
string message = "Error reading HUD: "; guiErrorMessage("Error reading HUD: ", e);
message += e.getMessage();
message += "\n at ";
message += e.getLocation().asString();
SG_LOG(SG_INPUT, SG_ALERT, message);
mkDialog(message.c_str());
return 0; return 0;
} }
@ -687,13 +682,8 @@ int readHud( istream &input )
SGPropertyNode root2; SGPropertyNode root2;
try { try {
readProperties(path.str(), &root2); readProperties(path.str(), &root2);
} catch (const sg_io_exception &e) { } catch (const sg_exception &e) {
string message = "Error reading HUD instrument: "; guiErrorMessage("Error reading HUD instrument: ", e);
message += e.getMessage();
message += "\n at ";
message += e.getLocation().asString();
SG_LOG(SG_INPUT, SG_ALERT, message);
mkDialog(message.c_str());
continue; continue;
} }
readInstrument(&root2); readInstrument(&root2);

16
src/Cockpit/panel_io.cxx
View file

@ -765,12 +765,8 @@ fgReadPanel (istream &input)
try { try {
readProperties(input, &root); readProperties(input, &root);
} catch (const sg_io_exception &e) { } catch (const sg_exception &e) {
string message = e.getMessage(); guiErrorMessage("Error reading panel: ", e);
message += "\n at ";
message += e.getLocation().asString();
SG_LOG(SG_INPUT, SG_ALERT, message);
mkDialog(message.c_str());
return 0; return 0;
} }
return readPanel(&root); return readPanel(&root);
@ -792,12 +788,8 @@ fgReadPanel (const string &relative_path)
try { try {
readProperties(path.str(), &root); readProperties(path.str(), &root);
} catch (const sg_io_exception &e) { } catch (const sg_exception &e) {
string message = e.getMessage(); guiErrorMessage("Error reading panel: ", e);
message += "\n at ";
message += e.getLocation().asString();
SG_LOG(SG_INPUT, SG_ALERT, message);
mkDialog(message.c_str());
return 0; return 0;
} }
return readPanel(&root); return readPanel(&root);

9
src/Main/fg_commands.cxx
View file

@ -212,13 +212,8 @@ do_preferences_load (const SGPropertyNode * arg, SGCommandState ** state)
<< props_path.str()); << props_path.str());
try { try {
readProperties(props_path.str(), globals->get_props()); readProperties(props_path.str(), globals->get_props());
} catch (const sg_io_exception &e) { } catch (const sg_exception &e) {
string message = "Error reading global preferences: "; guiErrorMessage("Error reading global preferences: ", e);
message += e.getMessage();
message += "\n at ";
message += e.getLocation().asString();
SG_LOG(SG_INPUT, SG_ALERT, message);
mkDialog(message.c_str());
return false; return false;
} }
SG_LOG(SG_INPUT, SG_INFO, "Successfully read global preferences."); SG_LOG(SG_INPUT, SG_INFO, "Successfully read global preferences.");