Skip to content

Commit

Permalink
Removed left over debug message and added back selection change event…
Browse files Browse the repository at this point in the history
… in about window.
  • Loading branch information
RickDB authored and RickDB committed Dec 27, 2016
1 parent f20ede8 commit ea06f1d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions JMMServer/ServerSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,16 @@ public static void LoadSettingsFromFile(string tmp_setting_file, bool delete_tmp
}
Utils.GrantAccess(ApplicationPath);
disabledSave = false;

// Migrate sqlite db file if necessary
if (DatabaseFile.Contains(programlocation))
{
string dbname = Path.GetFileName(DatabaseFile);
DatabaseFile = Path.Combine(ApplicationPath, dbname);
}

SaveSettings();

foreach (MigrationDirectory md in migrationdirs)
{
if (!md.SafeMigrate())
Expand Down Expand Up @@ -413,8 +416,6 @@ private static void WaitForMigrationThenRestart()

if (File.Exists(applicationPath))
{
MessageBox.Show("Application path = " + applicationPath);

ProcessStartInfo Info = new ProcessStartInfo();
Info.Arguments = "/C ping 127.0.0.1 -n 2 && \"" + applicationPath + "\"";
Info.WindowStyle = ProcessWindowStyle.Hidden;
Expand Down
2 changes: 1 addition & 1 deletion JMMServer/UI/AboutForm.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
</StackPanel>
</Button>
</StackPanel>
<ComboBox x:Name="cbUpdateChannel" HorizontalAlignment="Left" Margin="405,7,0,0" Grid.Row="2" VerticalAlignment="Top" Width="85" DropDownClosed="cbUpdateChannel_DropDownClosed"/>
<ComboBox x:Name="cbUpdateChannel" HorizontalAlignment="Left" Margin="405,7,0,0" Grid.Row="2" VerticalAlignment="Top" Width="85" DropDownClosed="cbUpdateChannel_DropDownClosed" SelectionChanged="cbUpdateChannel_SelectionChanged"/>

</Grid>
</Window>

0 comments on commit ea06f1d

Please sign in to comment.