From 70394b17199ccdb36ad6ca7c7d6ae1703c546600 Mon Sep 17 00:00:00 2001 From: JKlingen Date: Wed, 15 Aug 2012 12:21:23 +0000 Subject: [PATCH] fixed null reference when creating a new file + no longer show "unsaved changes" message if no changes have been made after saving git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1993 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs b/GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs index d25e9d9b8..9c2efd569 100644 --- a/GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs +++ b/GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs @@ -83,7 +83,6 @@ namespace GreenshotLanguageEditor { "https://greenshot.svn.sourceforge.net/svnroot/greenshot/trunk/Greenshot/Languages/"; dialog.ShowNewFolderButton = false; System.Windows.Forms.DialogResult result = dialog.ShowDialog(); - string languagePath; if (result == System.Windows.Forms.DialogResult.OK) { @@ -92,8 +91,7 @@ namespace GreenshotLanguageEditor { this.Close(); return; } - - //languagePath = @"C:\Users\jens\Documents\dotNET Projects\Greenshot\Greenshot\Languages"; + InitializeComponent(); DataContext = this; @@ -173,6 +171,9 @@ namespace GreenshotLanguageEditor { LanguageFile editedFile = (LanguageFile) (targetColumn == 1 ? language1ComboBox.SelectedItem : language2ComboBox.SelectedItem); CreateXML(editedFile.FilePath, targetColumn); + + if(targetColumn == 1) unsavedChangesInLanguage1 = false; + else if(targetColumn == 2) unsavedChangesInLanguage2 = false; } private void languageComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e) { @@ -216,7 +217,7 @@ namespace GreenshotLanguageEditor { } } LanguageFile newLang = new LanguageFile(); - newLang.FilePath = languagePath; + newLang.FileDir = languagePath; new MetaEditorWindow(newLang).ShowDialog(); if(newLang.FileName != null && newLang.FileName.Length > 0) { ClearColumn(targetColumn);