Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7712: Cherry-pick [321821] and [2dd0c9] from master.

Browse Source
This commit is contained in:
Nick Hall 2014-05-27 15:10:53 +01:00
parent 442663f53a
commit f104408968
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/gui/editors/editmedia.py
View File

@ -290,11 +290,8 @@ class EditMedia(EditPrimary):
return
path = conv_to_unicode(self.file_path.get_text())
ref_obj = self.dbstate.db.get_object_from_handle(self.obj.handle)
if ref_obj:
media_path = media_path_full(self.dbstate.db,
ref_obj.get_path())
if os.path.exists(os.path.join(os.path.dirname(media_path), path)):
full_path = media_path_full(self.db, path)
if os.path.isfile(full_path):
self.determine_mime()
else:
msg1 = _("There is no media matching the current path value!")
@ -306,7 +303,7 @@ class EditMedia(EditPrimary):
self.ok_button.set_sensitive(True)
return
self.obj.set_path(conv_to_unicode(path))
self.obj.set_path(path)
with DbTxn('', self.db) as trans:
if not self.obj.get_handle():