Skip to content

Fix: Load profiles on start #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BornToBeRoot merged 1 commit into from
Jan 26, 2021
Merged

Fix: Load profiles on start #448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Source/NETworkManager/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,23 +257,24 @@ public ICollectionView ProfileFiles
}
}

private ProfileFileInfo _selectedProfileFile;
private ProfileFileInfo _selectedProfileFile = null;
public ProfileFileInfo SelectedProfileFile
{
get => _selectedProfileFile;
set
{
if (value == _selectedProfileFile || (value != null && value.Equals(_selectedProfileFile)))
if (_isProfileLoading || (value != null && value.Equals(_selectedProfileFile)))
return;

_selectedProfileFile = value;

if (!_isProfileLoading && value != null && !value.Equals(ProfileManager.LoadedProfileFile))
// Switch profile...
if (value != null && !value.Equals(ProfileManager.LoadedProfileFile))
{
ProfileManager.SwitchProfile(value);
SettingsManager.Current.Profiles_LastSelected = value.Name;
}

OnPropertyChanged();
}
}
Expand Down Expand Up @@ -368,19 +369,16 @@ private void AfterContentRendered()

// Load profiles
_isProfileLoading = true;

ProfileFiles = new CollectionViewSource { Source = ProfileManager.ProfileFiles }.View;
ProfileFiles.SortDescriptions.Add(new SortDescription(nameof(ProfileFileInfo.Name), ListSortDirection.Ascending));
ProfileManager.OnProfileFileChangedEvent += ProfileManager_OnProfileFileChangedEvent;

_isProfileLoading = false;

// Switch profile
SelectedProfileFile = ProfileFiles.SourceCollection.Cast<ProfileFileInfo>().FirstOrDefault(x => x.Name == SettingsManager.Current.Profiles_LastSelected);

/*
if (SelectedProfileFile == null)
SelectedProfileFile = ProfileFiles.SourceCollection.Cast<ProfileFileInfo>().FirstOrDefault();
*/

// Hide to tray after the window shows up... not nice, but otherwise the hotkeys do not work
if (CommandLineManager.Current.Autostart && SettingsManager.Current.Autostart_StartMinimizedInTray)
Expand Down