fixed images not loading when using startup arguments

Henrik-Peters · Jul 28, 2017 · 0d0fbce · 0d0fbce
1 parent 05ca366
commit 0d0fbce
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ActivFlex Media/MainWindow.xaml.cs b/ActivFlex Media/MainWindow.xaml.cs
@@ -16,6 +16,7 @@
 // along with this program. If not, see<http://www.gnu.org/licenses/>.
 #endregion
 using System;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Diagnostics;
@@ -205,9 +206,17 @@ private void HandleStartupArguments()
                     ChangeFullscreenMode(true);
                     Window_StateChanged(this, null);
 
+                    //Browse to the directory of the first image
+                    vm.BrowseFileSystem.Execute(GetParentPath(StartupOptions.ImagePaths[0]));
+
                     if (StartupOptions.ImagePaths.Count == 1) {
                         //Single image provided
-                        vm.PresentImage.Execute(new MediaImage(StartupOptions.ImagePaths[0]));
+                        MediaImage firstImage = vm.FileSystemItems
+                            .Where(item => item.Path == StartupOptions.ImagePaths[0])
+                            .Cast<MediaImage>()
+                            .First();
+
+                        vm.LaunchPresenter.Execute(firstImage);
 
                     } else {
                         //Multiple images provided
@@ -220,9 +229,6 @@ private void HandleStartupArguments()
                         vm.PresentImage.Execute(new MediaImage(StartupOptions.ImagePaths[0]));
                     }
 
-                    //Browse to the directory of the first image
-                    vm.BrowseFileSystem.Execute(GetParentPath(StartupOptions.ImagePaths[0]));
-
                 } else if (StartupOptions.DirectoryPaths.Count == 1) {
                     //Single directory and no images provided
                     vm.BrowseFileSystem.Execute(StartupOptions.DirectoryPaths[0]);