From 79753923cc8549882fe3e16d2cfb2dbf5409d3ad Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Sun, 12 Dec 2021 17:09:17 +0200 Subject: [PATCH] [app] Fixed deletion of wrong state files State files in the root state directory were being deleted when a subdirectory was being scanned. --- app/src/BooksShelf.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/BooksShelf.cpp b/app/src/BooksShelf.cpp index 02b6a9f..51dc0ff 100644 --- a/app/src/BooksShelf.cpp +++ b/app/src/BooksShelf.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2018 Jolla Ltd. - * Copyright (C) 2015-2018 Slava Monich + * Copyright (C) 2015-2021 Jolla Ltd. + * Copyright (C) 2015-2021 Slava Monich * * You may use this file under the terms of the BSD license as follows: * @@ -8,15 +8,15 @@ * modification, are permitted provided that the following conditions * are met: * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Jolla Ltd nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -206,7 +206,7 @@ void BooksShelf::LoadTask::performTask() if (!isCanceled()) { QStringList deleteMe; const QString suffix(BOOKS_STATE_FILE_SUFFIX); - QDirIterator configIt(iStorage.configDir()); + QDirIterator configIt(iStorage.fullConfigPath(iRelativePath)); while (configIt.hasNext() && !isCanceled()) { QString path(configIt.next()); if (path.endsWith(suffix)) {