File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed
Source/vj0/Models/Profiles Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -51,6 +51,7 @@ public ProfileSplash(BaseProfileDisplay profile)
51
51
52
52
var splashPath = Path . Combine ( ContentFolder , "Splash" , "Splash.bmp" ) ;
53
53
54
+ if ( ! File . Exists ( splashPath ) ) splashPath = Path . Combine ( ContentFolder , "Splash" , "Splash.png" ) ;
54
55
if ( ! File . Exists ( splashPath ) ) return null ;
55
56
56
57
try
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ public async Task Initialize(CancellationToken cancellationToken = default)
87
87
}
88
88
await LoadKeys ( cancellationToken ) ;
89
89
90
- if ( Provider is not null && Provider . Keys . Count == 0 && Provider . RequiredKeys . Count > 0 )
90
+ if ( Provider is not null && Provider . Files . Count == 0 && Provider . Keys . Count == 0 && Provider . RequiredKeys . Count == 0 )
91
91
{
92
92
Status . OnFailure ( "Please enter a valid AES encryption key in the profile settings." ) ;
93
93
OnInitializationFailure ? . Invoke ( this ) ;
@@ -111,13 +111,12 @@ public async Task Initialize(CancellationToken cancellationToken = default)
111
111
{
112
112
return ;
113
113
}
114
- await Provider . MountAsync ( ) ;
114
+ // ? await Provider.MountAsync();
115
115
116
116
if ( cancellationToken . IsCancellationRequested )
117
117
{
118
118
return ;
119
119
}
120
- Provider . PostMount ( ) ;
121
120
122
121
SetLanguage ( Settings . Application . GameLanguage ) ;
123
122
}
@@ -257,12 +256,12 @@ private async Task LoadKeys(CancellationToken cancellationToken = default)
257
256
{
258
257
return ;
259
258
}
260
-
259
+
261
260
if ( Encryption . HasKeys && Provider is not null )
262
261
{
263
262
foreach ( var vfs in Provider . UnloadedVfs . ToArray ( ) )
264
263
{
265
- foreach ( var extraKey in Encryption . Keys . Where ( extraKey => extraKey . IsValid && extraKey . Key != "" ) . Where ( extraKey => vfs . TestAesKey ( extraKey . AESKey ) ) )
264
+ foreach ( var extraKey in Encryption . Keys . Where ( extraKey => extraKey . IsValid && extraKey . Key != "" ) )
266
265
{
267
266
if ( Provider is null ) continue ;
268
267
@@ -276,6 +275,15 @@ private async Task LoadKeys(CancellationToken cancellationToken = default)
276
275
}
277
276
}
278
277
}
278
+
279
+ if ( Provider is null ) return ;
280
+
281
+ if ( cancellationToken . IsCancellationRequested )
282
+ {
283
+ return ;
284
+ }
285
+
286
+ Provider . PostMount ( ) ;
279
287
}
280
288
}
281
289
You can’t perform that action at this time.
0 commit comments