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

fixed null reference when creating a new file + no longer show "unsaved changes" message if no changes have been made after saving

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1993 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
JKlingen 2012-08-15 12:21:23 +00:00
commit 70394b1719
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
GreenshotLanguageEditor/EntriesEditorWindow.xaml.cs
View file

@ -83,7 +83,6 @@ namespace GreenshotLanguageEditor {
"https://greenshot.svn.sourceforge.net/svnroot/greenshot/trunk/Greenshot/Languages/"; "https://greenshot.svn.sourceforge.net/svnroot/greenshot/trunk/Greenshot/Languages/";
dialog.ShowNewFolderButton = false; dialog.ShowNewFolderButton = false;
System.Windows.Forms.DialogResult result = dialog.ShowDialog(); System.Windows.Forms.DialogResult result = dialog.ShowDialog();
string languagePath;
if (result == System.Windows.Forms.DialogResult.OK) { if (result == System.Windows.Forms.DialogResult.OK) {
@ -92,8 +91,7 @@ namespace GreenshotLanguageEditor {
this.Close(); this.Close();
return; return;
} }
//languagePath = @"C:\Users\jens\Documents\dotNET Projects\Greenshot\Greenshot\Languages";
InitializeComponent(); InitializeComponent();
DataContext = this; DataContext = this;
@ -173,6 +171,9 @@ namespace GreenshotLanguageEditor {
LanguageFile editedFile = (LanguageFile) (targetColumn == 1 ? language1ComboBox.SelectedItem : language2ComboBox.SelectedItem); LanguageFile editedFile = (LanguageFile) (targetColumn == 1 ? language1ComboBox.SelectedItem : language2ComboBox.SelectedItem);
CreateXML(editedFile.FilePath, targetColumn); CreateXML(editedFile.FilePath, targetColumn);
if(targetColumn == 1) unsavedChangesInLanguage1 = false;
else if(targetColumn == 2) unsavedChangesInLanguage2 = false;
} }
private void languageComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e) { private void languageComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e) {
@ -216,7 +217,7 @@ namespace GreenshotLanguageEditor {
} }
} }
LanguageFile newLang = new LanguageFile(); LanguageFile newLang = new LanguageFile();
newLang.FilePath = languagePath; newLang.FileDir = languagePath;
new MetaEditorWindow(newLang).ShowDialog(); new MetaEditorWindow(newLang).ShowDialog();
if(newLang.FileName != null && newLang.FileName.Length > 0) { if(newLang.FileName != null && newLang.FileName.Length > 0) {
ClearColumn(targetColumn); ClearColumn(targetColumn);