소스 검색

show hello there and fix crash

Krzysztof Krysiński 5 달 전
부모
커밋
07e2eac350
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      src/PixiEditor/ViewModels/SubViewModels/FileViewModel.cs

+ 3 - 3
src/PixiEditor/ViewModels/SubViewModels/FileViewModel.cs

@@ -148,8 +148,7 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
         {
         {
             OpenFromPath(file);
             OpenFromPath(file);
         }
         }
-        else if ((Owner.DocumentManagerSubViewModel.Documents.Count == 0 && !args.Contains("--crash")) &&
-                 !args.Contains("--openedInExisting"))
+        else if (!args.Contains("--crash") && !args.Contains("--openedInExisting"))
         {
         {
             if (preferences!.GetPreference("ShowStartupWindow", true))
             if (preferences!.GetPreference("ShowStartupWindow", true))
             {
             {
@@ -817,7 +816,8 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
         if (originalPath != null && File.Exists(originalPath))
         if (originalPath != null && File.Exists(originalPath))
         {
         {
             DateTime saveFileWriteTime = File.GetLastWriteTime(originalPath);
             DateTime saveFileWriteTime = File.GetLastWriteTime(originalPath);
-            DateTime autosaveWriteTime = File.GetLastWriteTime(autosavePath);
+            bool autosaveExists = autosavePath != null && File.Exists(autosavePath);
+            DateTime autosaveWriteTime = autosaveExists ? File.GetLastWriteTime(autosavePath) : DateTime.MinValue;
 
 
             loadFromUserFile = saveFileWriteTime > autosaveWriteTime;
             loadFromUserFile = saveFileWriteTime > autosaveWriteTime;
         }
         }