medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[app] Fixed deletion of wrong state files

Browse source 
State files in the root state directory were being deleted when
a subdirectory was being scanned.
This commit is contained in:
Slava Monich 2021-12-12 17:09:17 +02:00
parent ab7c6849d4
commit 79753923cc
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/BooksShelf.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2015-2018 Jolla Ltd. * Copyright (C) 2015-2021 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com> * Copyright (C) 2015-2021 Slava Monich <slava.monich@jolla.com>
* *
* You may use this file under the terms of the BSD license as follows: * 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 * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* * Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer
* the documentation and/or other materials provided with the * in the documentation and/or other materials provided with the
* distribution. * distribution.
* * Neither the name of Jolla Ltd nor the names of its contributors * 3. Neither the names of the copyright holders nor the names of its
* may be used to endorse or promote products derived from this * contributors may be used to endorse or promote products derived
* software without specific prior written permission. * from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -206,7 +206,7 @@ void BooksShelf::LoadTask::performTask()
if (!isCanceled()) { if (!isCanceled()) {
QStringList deleteMe; QStringList deleteMe;
const QString suffix(BOOKS_STATE_FILE_SUFFIX); const QString suffix(BOOKS_STATE_FILE_SUFFIX);
QDirIterator configIt(iStorage.configDir()); QDirIterator configIt(iStorage.fullConfigPath(iRelativePath));
while (configIt.hasNext() && !isCanceled()) { while (configIt.hasNext() && !isCanceled()) {
QString path(configIt.next()); QString path(configIt.next());
if (path.endsWith(suffix)) { if (path.endsWith(suffix)) {