# HG changeset patch # User Wuzzy # Date 1557098750 -7200 # Node ID b5a9dd36c7eacf015316c54082601beb28d7d053 # Parent a414d37278df2dd9c727d0ef107735168cd88a1f pagevideos: Prevent renaming video if file name prefix is already used This prevents some issues and weirdnesses with losing the video thumbnail, etc. diff -r a414d37278df -r b5a9dd36c7ea QTfrontend/ui/page/pagevideos.cpp --- a/QTfrontend/ui/page/pagevideos.cpp Mon May 06 00:43:27 2019 +0200 +++ b/QTfrontend/ui/page/pagevideos.cpp Mon May 06 01:25:50 2019 +0200 @@ -292,6 +292,7 @@ VideoItem * item = nameItem(row); item->seen = true; item->desc = ""; + setName(item, item->name); updateSize(row); } @@ -426,8 +427,16 @@ } } else + newPrefix = newName; + for (int i = 0; i < filesTable->rowCount(); i++) { - newPrefix = newName; + // don't allow rename if duplicate prefix + VideoItem * iterateItem = nameItem(i); + if ((i != row) && (newPrefix == iterateItem->prefix)) + { + setName(item, oldName); + return; + } } #ifdef Q_OS_WIN // there is a bug in qt, QDir::rename() doesn't fail on such names but damages files @@ -460,6 +469,15 @@ item->setText(newName); nameChangedFromCode = false; item->name = newName; + // try to extract prefix + if (item->ready()) + item->prefix = item->name; + else + item->prefix = item->pRecorder->name; + // remove extension + int pt = item->prefix.lastIndexOf('.'); + if (pt != -1) + item->prefix.truncate(pt); } int PageVideos::appendRow(const QString & name) @@ -546,7 +564,7 @@ desc += item->desc + '\n'; } - if (item->prefix.isEmpty()) + if (item->prefix.isNull() || item->prefix.isEmpty()) { // try to extract prefix from file name instead if (item->ready())