CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-14 10:55:42 +12:00
Code Issues Packages Projects Releases Wiki Activity

fixed #127: Pushbullet device name null check

Browse source
This commit is contained in:
Jaex 2014-05-08 03:09:28 +03:00
parent 65e07b618c
commit 1c3f6e6d9a
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
UploadersLib/GUI/UploadersConfigFormGUI.cs
View file

@ -224,24 +224,6 @@ public void LoadSettings(UploadersConfig uploadersConfig)
txtPaste_eeUserAPIKey.Text = Config.Paste_eeUserAPIKey; txtPaste_eeUserAPIKey.Text = Config.Paste_eeUserAPIKey;
//Pushbullet
txtPushbulletUserKey.Text = Config.PushbulletSettings.UserAPIKey;
if (Config.PushbulletSettings.DeviceList.Count > 0)
{
Config.PushbulletSettings.DeviceList.ForEach(x => cboPushbulletDevices.Items.Add(x.Name));
if (Config.PushbulletSettings.DeviceList.IsValidIndex(Config.PushbulletSettings.SelectedDevice))
{
cboPushbulletDevices.SelectedIndex = Config.PushbulletSettings.SelectedDevice;
}
else
{
cboPushbulletDevices.SelectedIndex = 0;
}
}
// Gist // Gist
atcGistAccountType.SelectedAccountType = Config.GistAnonymousLogin ? AccountType.Anonymous : AccountType.User; atcGistAccountType.SelectedAccountType = Config.GistAnonymousLogin ? AccountType.Anonymous : AccountType.User;
@ -424,6 +406,24 @@ public void LoadSettings(UploadersConfig uploadersConfig)
MegaConfigureTab(false); MegaConfigureTab(false);
//Pushbullet
txtPushbulletUserKey.Text = Config.PushbulletSettings.UserAPIKey;
if (Config.PushbulletSettings.DeviceList.Count > 0)
{
Config.PushbulletSettings.DeviceList.ForEach(x => cboPushbulletDevices.Items.Add(x.Name ?? "Invalid device name"));
if (Config.PushbulletSettings.DeviceList.IsValidIndex(Config.PushbulletSettings.SelectedDevice))
{
cboPushbulletDevices.SelectedIndex = Config.PushbulletSettings.SelectedDevice;
}
else
{
cboPushbulletDevices.SelectedIndex = 0;
}
}
// Amazon S3 // Amazon S3
txtAmazonS3AccessKey.Text = Config.AmazonS3Settings.AccessKeyID; txtAmazonS3AccessKey.Text = Config.AmazonS3Settings.AccessKeyID;

2
UploadersLib/GUI/UploadersConfigFormHelper.cs
View file

@ -1135,7 +1135,7 @@ public void PushbulletGetDevices()
Config.PushbulletSettings.DeviceList.ForEach(pbDevice => Config.PushbulletSettings.DeviceList.ForEach(pbDevice =>
{ {
cboPushbulletDevices.Items.Add(pbDevice.Name); cboPushbulletDevices.Items.Add(pbDevice.Name ?? "Invalid device name");
}); });
cboPushbulletDevices.SelectedIndex = 0; cboPushbulletDevices.SelectedIndex = 0;