Skip to content
This repository was archived by the owner on Jul 18, 2020. It is now read-only.

Commit 5ff26df

Browse files
mrousavymrousavy
committed
R: Bugfixes (crash, ..) and Improvements
1 parent 556d885 commit 5ff26df

File tree

10 files changed

+51
-47
lines changed

10 files changed

+51
-47
lines changed

‎Downloads/ImgurSniper.zip‎

46 Bytes
Binary file not shown.

‎Downloads/ImgurSniperSetup.zip‎

112 Bytes
Binary file not shown.

‎ImgurSniper.UI/MainWindow.xaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public MainWindow() {
4646
//Command Line Args
4747
private async void Arguments() {
4848
string[] args = Environment.GetCommandLineArgs();
49-
if (args.Contains("Help")) {
49+
if (args.Contains("help")) {
5050
Hide();
5151
Help(null, null);
5252
Close();
5353
}
54-
if (args.Contains("Update")) {
54+
if (args.Contains("update")) {
5555
Hide();
5656
bool updateAvailable = await InstallerHelper.CheckForUpdates(this, true);
5757
if (updateAvailable) {
@@ -60,7 +60,7 @@ private async void Arguments() {
6060
Close();
6161
}
6262
}
63-
if (args.Contains("Troubleshooting")) {
63+
if (args.Contains("troubleshooting")) {
6464
//Task.Delay for Open/Close Animations
6565
await Task.Delay(400);
6666
await ShowOkDialog(str.troubleshooting, str.troubleshootingTips);

‎ImgurSniper.UI/Pages/SettingsPages/CapturePage.xaml.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Drawing.Imaging;
1+
using ImgurSniper.UI.Properties;
2+
using System.Drawing.Imaging;
23
using System.Windows;
34
using System.Windows.Controls;
4-
using ImgurSniper.UI.Properties;
55

66
namespace ImgurSniper.UI.Pages.SettingsPages {
77
/// <summary>
@@ -21,10 +21,10 @@ public CapturePage() {
2121

2222
//Load all Config Params
2323
private async void Load() {
24-
_window.ShowProgressIndicator();
24+
_window?.ShowProgressIndicator();
2525

2626
//Update Loading Indicator
27-
_window.SetProgressStatus(strings.loadConf);
27+
_window?.SetProgressStatus(strings.loadConf);
2828

2929
try {
3030
Settings settings = ConfigHelper.JsonConfig;
@@ -76,7 +76,7 @@ private async void Load() {
7676
}
7777

7878
//Remove Loading Indicator
79-
_window.HideProgressIndicator();
79+
_window?.HideProgressIndicator();
8080
}
8181

8282

@@ -146,7 +146,7 @@ private void QualitySlider_ValueChanged(object sender, RoutedPropertyChangedEven
146146

147147
private void EnableSave() {
148148
try {
149-
_window.EnableSave();
149+
_window?.EnableSave();
150150
} catch {
151151
// no parent found
152152
}

‎ImgurSniper.UI/Pages/SettingsPages/EventsPage.xaml.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System.IO;
1+
using ImgurSniper.UI.Properties;
2+
using System.IO;
23
using System.Windows;
34
using System.Windows.Forms;
45
using System.Windows.Input;
5-
using ImgurSniper.UI.Properties;
66
using Application = System.Windows.Application;
77
using CheckBox = System.Windows.Controls.CheckBox;
88
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
@@ -25,10 +25,10 @@ public EventsPage() {
2525

2626
//Load all Config Params
2727
private async void Load() {
28-
_window.ShowProgressIndicator();
28+
_window?.ShowProgressIndicator();
2929

3030
//Update Loading Indicator
31-
_window.SetProgressStatus(strings.loadConf);
31+
_window?.SetProgressStatus(strings.loadConf);
3232

3333
try {
3434
Settings settings = ConfigHelper.JsonConfig;
@@ -81,7 +81,7 @@ private async void Load() {
8181
}
8282

8383
//Remove Loading Indicator
84-
_window.HideProgressIndicator();
84+
_window?.HideProgressIndicator();
8585
}
8686

8787
#region UI
@@ -174,7 +174,7 @@ private async void SavePath() {
174174

175175
private void EnableSave() {
176176
try {
177-
_window.EnableSave();
177+
_window?.EnableSave();
178178
} catch {
179179
// no parent found
180180
}

‎ImgurSniper.UI/Pages/SettingsPages/HomePage.xaml.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
1+
using ImgurSniper.UI.Properties;
2+
using System;
23
using System.Diagnostics;
34
using System.IO;
45
using System.Threading.Tasks;
56
using System.Windows;
6-
using ImgurSniper.UI.Properties;
77
using Path = System.IO.Path;
88

99
namespace ImgurSniper.UI.Pages.SettingsPages {
@@ -26,7 +26,7 @@ public HomePage() {
2626
}
2727
}
2828

29-
private void Help(object sender, RoutedEventArgs e) { _window.Help(sender, e); }
29+
private void Help(object sender, RoutedEventArgs e) { _window?.Help(sender, e); }
3030

3131
private async void Snipe(object sender, RoutedEventArgs e) {
3232
string exe = Path.Combine(ConfigHelper.InstallDir, "ImgurSniper.exe");
@@ -35,14 +35,16 @@ private async void Snipe(object sender, RoutedEventArgs e) {
3535
Process snipeProc = new Process { StartInfo = new ProcessStartInfo(exe) };
3636
snipeProc.Start();
3737

38-
_window.Visibility = Visibility.Hidden;
38+
if (_window != null)
39+
_window.Visibility = Visibility.Hidden;
3940

4041
await Task.Delay(500);
4142
snipeProc.WaitForExit();
4243

43-
_window.Visibility = Visibility.Visible;
44+
if (_window != null)
45+
_window.Visibility = Visibility.Visible;
4446
} else {
45-
_window.ErrorToast.Show(strings.imgurSniperNotFound,
47+
_window?.ErrorToast.Show(strings.imgurSniperNotFound,
4648
TimeSpan.FromSeconds(3));
4749
}
4850
}
@@ -59,14 +61,16 @@ public async void Gif(object sender, RoutedEventArgs e) {
5961
};
6062
snipeProc.Start();
6163

62-
_window.Visibility = Visibility.Hidden;
64+
if (_window != null)
65+
_window.Visibility = Visibility.Hidden;
6366

6467
await Task.Delay(500);
6568
snipeProc.WaitForExit();
6669

67-
_window.Visibility = Visibility.Visible;
70+
if (_window != null)
71+
_window.Visibility = Visibility.Visible;
6872
} else {
69-
_window.ErrorToast.Show(strings.imgurSniperNotFound,
73+
_window?.ErrorToast.Show(strings.imgurSniperNotFound,
7074
TimeSpan.FromSeconds(3));
7175
}
7276
}

‎ImgurSniper.UI/Pages/SettingsPages/ImgurPage.xaml.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System.Diagnostics;
1+
using ImgurSniper.UI.Properties;
2+
using System.Diagnostics;
23
using System.Windows;
34
using System.Windows.Controls;
4-
using System.Windows.Media;
5-
using System.Windows.Media.Animation;
6-
using ImgurSniper.UI.Properties;
75

86
namespace ImgurSniper.UI.Pages.SettingsPages {
97
/// <summary>
@@ -17,17 +15,17 @@ public ImgurPage() {
1715
InitializeComponent();
1816

1917
_window = (MainWindow)Application.Current.MainWindow;
20-
_imgurhelper = new ImgurLoginHelper(_window.ErrorToast, _window.SuccessToast);
18+
_imgurhelper = new ImgurLoginHelper(_window?.ErrorToast, _window?.SuccessToast);
2119

2220
Load();
2321
}
2422

2523
//Load all Config Params
2624
private async void Load() {
27-
_window.ShowProgressIndicator();
25+
_window?.ShowProgressIndicator();
2826

2927
//Update Loading Indicator
30-
_window.SetProgressStatus(strings.contactImgur);
28+
_window?.SetProgressStatus(strings.contactImgur);
3129

3230
try {
3331
string refreshToken = ConfigHelper.ReadRefreshToken();
@@ -55,7 +53,7 @@ private async void Load() {
5553
}
5654

5755
//Remove Loading Indicator
58-
_window.HideProgressIndicator();
56+
_window?.HideProgressIndicator();
5957
}
6058

6159

‎ImgurSniper.UI/Pages/SettingsPages/OtherPage.xaml.cs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System.Diagnostics;
1+
using ImgurSniper.UI.Properties;
2+
using System.Diagnostics;
23
using System.Windows;
34
using System.Windows.Controls;
45
using System.Windows.Input;
5-
using ImgurSniper.UI.Properties;
66
using Application = System.Windows.Application;
77

88
namespace ImgurSniper.UI.Pages.SettingsPages {
@@ -20,10 +20,10 @@ public OtherPage() {
2020
}
2121

2222
private async void Load() {
23-
_window.ShowProgressIndicator();
23+
_window?.ShowProgressIndicator();
2424

2525
//Update Loading Indicator
26-
_window.SetProgressStatus(strings.loadConf);
26+
_window?.SetProgressStatus(strings.loadConf);
2727

2828
try {
2929
Settings settings = ConfigHelper.JsonConfig;
@@ -71,16 +71,18 @@ await Dialog.ShowOkDialog(strings.couldNotLoad,
7171
}
7272

7373
//Search for Updates
74-
_window.SetProgressStatus(strings.checkingUpdate);
75-
BtnUpdate.IsEnabled = await InstallerHelper.CheckForUpdates(_window, false);
74+
if (_window != null) {
75+
_window.SetProgressStatus(strings.checkingUpdate);
76+
BtnUpdate.IsEnabled = await InstallerHelper.CheckForUpdates(_window, false);
77+
}
7678

7779
//Remove Loading Indicator
78-
_window.HideProgressIndicator();
80+
_window?.HideProgressIndicator();
7981
}
8082

8183

8284
#region UI
83-
private void Update(object sender, RoutedEventArgs e) { _window.Update(sender, e); }
85+
private void Update(object sender, RoutedEventArgs e) { _window?.Update(sender, e); }
8486

8587
private async void RunOnBoot_Checkbox(object sender, RoutedEventArgs e) {
8688
if (sender is CheckBox box) {
@@ -110,12 +112,12 @@ private async void Btn_SearchUpdates(object sender, RoutedEventArgs e) {
110112
}
111113

112114
//Show Progress Indicator
113-
_window.ShowProgressIndicator();
115+
_window?.ShowProgressIndicator();
114116

115117
BtnUpdate.IsEnabled = await InstallerHelper.CheckForUpdates(_window, true);
116118

117119
//Hide Progress Indicator
118-
_window.HideProgressIndicator();
120+
_window?.HideProgressIndicator();
119121

120122
if (btn != null) {
121123
btn.IsEnabled = true;
@@ -255,7 +257,7 @@ private async void LanguageBox_SelectionChanged(object sender, SelectionChangedE
255257

256258
private void EnableSave() {
257259
try {
258-
_window.EnableSave();
260+
_window?.EnableSave();
259261
} catch {
260262
// no parent found
261263
}

‎ImgurSniper/Libraries/Start/StartTray.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System;
2-
using ImgurSniper.Libraries.Helper;
1+
using ImgurSniper.Libraries.Helper;
32
using ImgurSniper.Libraries.Hotkeys;
43
using ImgurSniper.Properties;
4+
using System;
55
using System.Diagnostics;
66
using System.Drawing;
77
using System.IO;
@@ -66,7 +66,7 @@ public static async Task Initialize(EntryWindow caller) {
6666
helpMenuItem.Image = _iconHelp;
6767
helpMenuItem.Click += delegate {
6868
try {
69-
Process.Start(Path.Combine(ConfigHelper.InstallDir, "ImgurSniper.UI.exe"), "Help");
69+
Process.Start(Path.Combine(ConfigHelper.InstallDir, "ImgurSniper.UI.exe"), "help");
7070
} catch {
7171
// ignored
7272
}

‎ImgurSniper/NotificationWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class NotificationWindow : IDisposable {
1717
public static bool IsShown { get; private set; }
1818

1919
public static readonly Action ActionTroubleshoot =
20-
delegate { Process.Start(Path.Combine(ConfigHelper.InstallDir, "ImgurSniper.UI.exe"), "Troubleshooting"); };
20+
delegate { Process.Start(Path.Combine(ConfigHelper.InstallDir, "ImgurSniper.UI.exe"), "troubleshooting"); };
2121

2222
public enum NotificationType {
2323
Progress,

0 commit comments

Comments
 (0)