diff --git a/AtlasView/AtlasView.csproj b/AtlasView/AtlasView.csproj index 340ecfb..2df2c31 100644 --- a/AtlasView/AtlasView.csproj +++ b/AtlasView/AtlasView.csproj @@ -1,6 +1,6 @@  - + @@ -43,8 +43,8 @@ true - - ..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll @@ -148,6 +148,6 @@ - + \ No newline at end of file diff --git a/AtlasView/ViewModels/MainWindowViewModel.cs b/AtlasView/ViewModels/MainWindowViewModel.cs index 6be878e..64ee882 100644 --- a/AtlasView/ViewModels/MainWindowViewModel.cs +++ b/AtlasView/ViewModels/MainWindowViewModel.cs @@ -23,6 +23,16 @@ public MainWindowViewModel() { Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory; + if(!LibSanBag.ResourceUtils.Unpacker.IsAvailable) + { + MessageBox.Show( + "This program requires additional dependencies to run. Please obtain one of the following DLLs and place it in the directory containing " + System.AppDomain.CurrentDomain.FriendlyName + ":\n" + + " oo2core_6_win64.dll\n" + + " oo2core_7_win64.dll", + "Error", MessageBoxButton.OK, MessageBoxImage.Error + ); + } + try { CurrentView = new Views.AtlasView diff --git a/AtlasView/packages.config b/AtlasView/packages.config index c156233..0d91852 100644 --- a/AtlasView/packages.config +++ b/AtlasView/packages.config @@ -1,6 +1,6 @@  - + diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.csproj index 897b2af..2d466b9 100644 --- a/CommonUI/CommonUI.csproj +++ b/CommonUI/CommonUI.csproj @@ -1,6 +1,6 @@  - + @@ -51,8 +51,8 @@ ..\packages\ICSharpCode.Decompiler.4.0.0.4509-rc1\lib\net46\ICSharpCode.Decompiler.dll - - ..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll @@ -254,6 +254,6 @@ - + \ No newline at end of file diff --git a/CommonUI/packages.config b/CommonUI/packages.config index bff489a..f39d598 100644 --- a/CommonUI/packages.config +++ b/CommonUI/packages.config @@ -4,7 +4,7 @@ - + diff --git a/SanBag/SanBag.csproj b/SanBag/SanBag.csproj index dac0726..bcfb92b 100644 --- a/SanBag/SanBag.csproj +++ b/SanBag/SanBag.csproj @@ -1,6 +1,6 @@  - + @@ -43,8 +43,8 @@ true - - ..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll @@ -161,6 +161,6 @@ - + \ No newline at end of file diff --git a/SanBag/ViewModels/MainWindowViewModel.cs b/SanBag/ViewModels/MainWindowViewModel.cs index 3ab5ae4..978375b 100644 --- a/SanBag/ViewModels/MainWindowViewModel.cs +++ b/SanBag/ViewModels/MainWindowViewModel.cs @@ -31,6 +31,16 @@ public MainWindowViewModel() { Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory; + if(!LibSanBag.ResourceUtils.Unpacker.IsAvailable) + { + MessageBox.Show( + "This program requires additional dependencies to run. Please obtain one of the following DLLs and place it in the directory containing " + System.AppDomain.CurrentDomain.FriendlyName + ":\n" + + " oo2core_6_win64.dll\n" + + " oo2core_7_win64.dll", + "Error", MessageBoxButton.OK, MessageBoxImage.Error + ); + } + try { var arguments = Environment.GetCommandLineArgs(); diff --git a/SanBag/packages.config b/SanBag/packages.config index bdff982..bde6fee 100644 --- a/SanBag/packages.config +++ b/SanBag/packages.config @@ -1,6 +1,6 @@  - +