diff --git a/ChangeLog b/ChangeLog index 96f0e7c1..7fd80da6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14645,3 +14645,6 @@ segfault when dropping a cart on the log list. 2014-11-06 Fred Gleason * Incremented the package version to 2.10.1int00. +2014-11-10 Fred Gleason + * Fixed a bug in 'rdlogedit/edit_log.cpp' that allowed GUID data + in the clipboard to be transferred between logs. diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 7d753c0b..31834e8f 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -1153,6 +1153,9 @@ void EditLog::okData() #ifndef WIN32 edit_player->stop(); #endif // WIN32 + for(unsigned i=0;isize();i++) { + edit_clipboard->at(i).clearExternalData(); + } done(0); } @@ -1183,6 +1186,9 @@ void EditLog::cancelData() #ifndef WIN32 edit_player->stop(); #endif // WIN32 + for(unsigned i=0;isize();i++) { + edit_clipboard->at(i).clearExternalData(); + } done(1); }