Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 11:54:13 +08:00
Code Issues Projects Releases Wiki Activity

fallback to current directory if path specified in command line is inaccessible.

Browse Source
This commit is contained in:
morkt 2015-09-20 05:20:42 +04:00
parent 2f3b80e744
commit 409c87653a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MainWindow.xaml.cs
View File

@ -90,7 +90,20 @@ namespace GARbro.GUI
void WindowRendered () void WindowRendered ()
{ {
ViewModel = CreateViewModel (m_app.InitPath); DirectoryViewModel vm = null;
try
{
vm = GetNewViewModel (m_app.InitPath);
}
catch (Exception X)
{
PopupError (X.Message, guiStrings.MsgErrorOpening);
}
if (null == vm)
{
vm = CreateViewModel (Directory.GetCurrentDirectory(), true);
}
ViewModel = vm;
lv_SelectItem (0); lv_SelectItem (0);
SetStatusText (guiStrings.MsgReady); SetStatusText (guiStrings.MsgReady);
} }
@ -297,7 +310,7 @@ namespace GARbro.GUI
/// Create view model corresponding to <paramref name="path"> or empty view model if there was /// Create view model corresponding to <paramref name="path"> or empty view model if there was
/// an error accessing path. /// an error accessing path.
/// </summary> /// </summary>
DirectoryViewModel CreateViewModel (string path) DirectoryViewModel CreateViewModel (string path, bool suppress_warning = false)
{ {
try try
{ {
@ -305,6 +318,7 @@ namespace GARbro.GUI
} }
catch (Exception X) catch (Exception X)
{ {
if (!suppress_warning)
PopupError (X.Message, guiStrings.MsgErrorOpening); PopupError (X.Message, guiStrings.MsgErrorOpening);
return new DirectoryViewModel (new string[] { "" }, new Entry[0], false); return new DirectoryViewModel (new string[] { "" }, new Entry[0], false);
} }