From: Ivan Frade <ivan.frade@nokia.com>
Date: Wed, 21 Apr 2010 11:46:58 +0000 (+0300)
Subject: Fixes MB#8912, crashes when saving song metadata
X-Git-Tag: mussorgsky-0.5-1~14
X-Git-Url: http://git.maemo.org/git/?p=mussorgsky;a=commitdiff_plain;h=84dbf0e8fd52e294e9c59dfa27426f03812391df;ds=sidebyside

Fixes MB#8912, crashes when saving song metadata

Take the data directly from the filtered model instead of using a
 cached and potentially invalid iterator
---

diff --git a/src/edit_panel_tm.py b/src/edit_panel_tm.py
index 6c49a22..47e9807 100644
--- a/src/edit_panel_tm.py
+++ b/src/edit_panel_tm.py
@@ -32,6 +32,7 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         self.data_loaded = False
         self.artist_list = None
         self.albums_list = None
+        self.current = None
         self.connect ("delete-event", self.close_function)
 
     def close_function (self, widget, event):
@@ -143,16 +144,16 @@ class MussorgskyEditPanel (hildon.StackableWindow):
                                                  escape_html (artist) + " / " + escape_html (album))
         search_str = artist.lower () + " " + title.lower () + " " + album.lower ()
 
+        uri, mime = m.get (c, URI_COLUMN, MIME_COLUMN)
         m.set (c,
                ARTIST_COLUMN, artist,
                TITLE_COLUMN, title,
                ALBUM_COLUMN, album,
                UI_COLUMN, text,
                SEARCH_COLUMN, search_str)
-        new_song = self.get_current_row ()
         try:
-            self.writer.save_metadata_on_file (new_song[URI_COLUMN],
-                                               new_song[MIME_COLUMN],
+            self.writer.save_metadata_on_file (uri,#new_song[URI_COLUMN],
+                                               mime, #new_song[MIME_COLUMN],
                                                self.artist_button.get_value (),
                                                self.title_entry.get_text (),
                                                self.album_button.get_value ())