From 83716124e64dd231a0ffd8df716b39e3a57080b0 Mon Sep 17 00:00:00 2001 From: Karl Tatom Date: Sun, 30 Aug 2020 21:29:35 -0700 Subject: [PATCH 1/2] Fix storing invalid devices to settings --- ShareX.UploadersLib/FileUploaders/Pushbullet.cs | 2 +- ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs index 98e0809c7..107b44b93 100644 --- a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs +++ b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs @@ -181,7 +181,7 @@ public List GetDeviceList() PushbulletResponseDevices devicesResponse = JsonConvert.DeserializeObject(response); if (devicesResponse != null && devicesResponse.devices != null) - return devicesResponse.devices.Select(x => new PushbulletDevice { Key = x.iden, Name = x.nickname }).ToList(); + return devicesResponse.devices.Where(x => !String.IsNullOrEmpty(x.nickname)).Select(x1 => new PushbulletDevice { Key = x1.iden, Name = x1.nickname }).ToList(); return new List(); } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index 0694c472b..bd4cc29b9 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -799,7 +799,8 @@ public void PushbulletGetDevices() Config.PushbulletSettings.DeviceList.ForEach(pbDevice => { - cboPushbulletDevices.Items.Add(pbDevice.Name ?? Resources.UploadersConfigForm_LoadSettings_Invalid_device_name); + if (!String.IsNullOrEmpty(pbDevice.Name)) + cboPushbulletDevices.Items.Add(pbDevice.Name);// ?? Resources.UploadersConfigForm_LoadSettings_Invalid_device_name); }); cboPushbulletDevices.SelectedIndex = 0; From 12a4873b9faeabea50677c403a8793a17a3c0535 Mon Sep 17 00:00:00 2001 From: Karl Tatom Date: Sun, 30 Aug 2020 21:42:42 -0700 Subject: [PATCH 2/2] remove unneeded comment --- ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index bd4cc29b9..c3d2ff1c7 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -800,7 +800,7 @@ public void PushbulletGetDevices() Config.PushbulletSettings.DeviceList.ForEach(pbDevice => { if (!String.IsNullOrEmpty(pbDevice.Name)) - cboPushbulletDevices.Items.Add(pbDevice.Name);// ?? Resources.UploadersConfigForm_LoadSettings_Invalid_device_name); + cboPushbulletDevices.Items.Add(pbDevice.Name); }); cboPushbulletDevices.SelectedIndex = 0;