@@ -18,12 +18,12 @@ public class MainWindowViewModel : ViewModelBase
1818 private readonly RconService _rconService ;
1919 private readonly FtpService _ftpService ;
2020 private readonly SftpService _sftpService ;
21- private FilesService _filesService ;
21+ private FilesService ? _filesService ;
2222 private readonly ServerConfigurationService _configService ;
2323 private readonly ServerStatusService _statusService ;
2424 private readonly CommandHistoryService _commandHistoryService ;
2525 private readonly Timer _statusUpdateTimer ;
26- private ServerConfig _serverBeingEdited ;
26+ private ServerConfig ? _serverBeingEdited ;
2727 private readonly Timer _statusClearTimer ;
2828 private readonly object _statusLock = new ( ) ;
2929
@@ -71,8 +71,8 @@ public string RemoteBrowsePath
7171 set => this . RaiseAndSetIfChanged ( ref _remoteBrowsePath , value ) ;
7272 }
7373
74- private ServerConfig _selectedServer ;
75- public ServerConfig SelectedServer
74+ private ServerConfig ? _selectedServer ;
75+ public ServerConfig ? SelectedServer
7676 {
7777 get => _selectedServer ;
7878 set => this . RaiseAndSetIfChanged ( ref _selectedServer , value ) ;
@@ -199,7 +199,7 @@ private async Task<string> ListDirectoryWithCorrectServiceAsync(ServerConfig ser
199199 }
200200 }
201201
202- private void ClearStatusCallback ( object state )
202+ private void ClearStatusCallback ( object ? state )
203203 {
204204 Dispatcher . UIThread . Post ( ( ) =>
205205 {
@@ -323,13 +323,16 @@ private void SaveServerEdit()
323323 // Exit edit mode
324324 IsEditingServer = false ;
325325
326- UpdateStatus ( $ "Server configuration saved: { SelectedServer . DisplayName } ") ;
326+ UpdateStatus ( $ "Server configuration saved: { SelectedServer ? . DisplayName ?? "Unknown" } ") ;
327327
328328 // Save the configuration
329329 Task . Run ( SaveConfigAsync ) ;
330330
331331 // Try to update server status
332- Task . Run ( async ( ) => await _statusService . UpdateServerInfoAsync ( SelectedServer ) ) ;
332+ if ( SelectedServer != null )
333+ {
334+ Task . Run ( async ( ) => await _statusService . UpdateServerInfoAsync ( SelectedServer ) ) ;
335+ }
333336 }
334337
335338 private void CancelEdit ( )
0 commit comments