github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed exception due to wrong init.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1773 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-04-11 11:23:17 +00:00
commit d8ee90e5f1
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
GreenshotJiraPlugin/Forms/SettingsForm.cs
View file

@ -27,9 +27,8 @@ namespace GreenshotJiraPlugin {
/// Description of PasswordRequestForm. /// Description of PasswordRequestForm.
/// </summary> /// </summary>
public partial class SettingsForm : GreenshotPlugin.Controls.GreenshotForm { public partial class SettingsForm : GreenshotPlugin.Controls.GreenshotForm {
private ILanguage lang = Language.GetInstance();
public SettingsForm(JiraConfiguration config) { public SettingsForm(JiraConfiguration config) {
language = Language.GetInstance();
// //
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //

13
GreenshotJiraPlugin/JiraPlugin.cs
View file

@ -120,12 +120,13 @@ namespace GreenshotJiraPlugin {
/// </summary> /// </summary>
public virtual void Configure() { public virtual void Configure() {
string url = config.Url; string url = config.Url;
config.ShowConfigDialog(); if (config.ShowConfigDialog()) {
// check for re-login // check for re-login
if (jiraConnector.isLoggedIn && !string.IsNullOrEmpty(url)) { if (jiraConnector != null && jiraConnector.isLoggedIn && !string.IsNullOrEmpty(url)) {
if (!url.Equals(config.Url)) { if (!url.Equals(config.Url)) {
jiraConnector.logout(); jiraConnector.logout();
jiraConnector.login(); jiraConnector.login();
}
} }
} }
} }

2
GreenshotPlugin/Controls/GreenshotForm.cs
View file

@ -46,7 +46,7 @@ namespace GreenshotPlugin.Controls {
/// </summary> /// </summary>
protected void ApplyLanguage() { protected void ApplyLanguage() {
if (language == null) { if (language == null) {
throw new ArgumentNullException("Language not set!!"); throw new ArgumentNullException("Language not set!! Please use 'language = Language.GetInstance()' in your form constructor!");
} }
// Set title of the form // Set title of the form
if (!string.IsNullOrEmpty(LanguageKey)) { if (!string.IsNullOrEmpty(LanguageKey)) {