andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into kauth

This commit is contained in:
Andrius Štikonas 2018-03-31 20:30:05 +01:00
parent 5e85f0b974 c1f4b36305
commit 2527b3ecc3
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/operationrunner.cpp
View File

@ -60,9 +60,9 @@ void OperationRunner::run()
for (int i = 0; i < numOperations(); i++) {
suspendMutex().lock();
suspendMutex().unlock();
if (!status || isCancelling()) {
suspendMutex().unlock();
break;
}
@ -79,13 +79,6 @@ void OperationRunner::run()
disconnect(op, &Operation::progress, this, &OperationRunner::progressSub);
emit opFinished(i + 1, op);
suspendMutex().unlock();
// Sleep a little to give others a chance to suspend us. This should normally not be
// required -- is it possible that the compiler just optimizes our unlock/lock away
// if we don't sleep?
msleep(5);
}
if (automounter)

3
src/plugins/dummy/pmdummybackendplugin.json
View File

@ -12,6 +12,7 @@
"Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.",
"Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.",
"Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden",
"Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.",
"Description[sk]": "Testovací program v pozadí KDE Správcu partícií",
@ -25,7 +26,9 @@
"Name": "KDE Partition Manager Dummy Backend",
"Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE",
"Name[de]": "KDE-Partitionsverwaltung Dummy-Backend",
"Name[es]": "Motor de simulación para el gestor de particiones de KDE",
"Name[fi]": "KDE:n osionhallinnan valetaustaosa",
"Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE",
"Name[id]": "Backend Tiruan Pengelola Partisi KDE",