Merge branch 'master' of https://github.com/TASVideos/BizHawk
This commit is contained in:
commit
8df015cb0a
|
@ -81,14 +81,14 @@ namespace BizHawk.Client.Common
|
|||
return "Command ran successfully";
|
||||
|
||||
}
|
||||
catch (NullReferenceException nullEX)
|
||||
catch (NullReferenceException)
|
||||
{
|
||||
return "Database not open.";
|
||||
}
|
||||
catch (SQLiteException sqlEX)
|
||||
catch (SQLiteException sqlEx)
|
||||
{
|
||||
m_dbConnection.Close();
|
||||
return sqlEX.Message;
|
||||
return sqlEx.Message;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -944,11 +944,11 @@ namespace BizHawk.Client.EmuHawk
|
|||
//TODO add error text to dialog?
|
||||
// Re-show dialog if the address isn't found
|
||||
}
|
||||
catch (FormatException e)
|
||||
catch (FormatException)
|
||||
{
|
||||
// Re-show dialog if given invalid text (shouldn't happen)
|
||||
}
|
||||
catch (OverflowException e)
|
||||
catch (OverflowException)
|
||||
{
|
||||
//TODO add error text to dialog?
|
||||
// Re-show dialog if the address isn't valid
|
||||
|
|
Loading…
Reference in New Issue