# # # patch "src/monotone/MonotoneManager.cpp" # from [ea647e4d5d9528c83e2a5fd9541ebb12d682e4b9] # to [9ad384c8bd306c2eb6414627dee5b41c2dc50966] # ============================================================ --- src/monotone/MonotoneManager.cpp ea647e4d5d9528c83e2a5fd9541ebb12d682e4b9 +++ src/monotone/MonotoneManager.cpp 9ad384c8bd306c2eb6414627dee5b41c2dc50966 @@ -63,7 +63,7 @@ MonotoneThread * MonotoneManager::getThr // ensure that its normalized WorkspacePath normalizedWorkspace = normalizeWorkspacePath(workspace); DatabaseFile databaseFile = getDatabaseFilePath(normalizedWorkspace); - return getThread(databaseFile, workspace); + return getThread(databaseFile, normalizedWorkspace); } MonotoneThread * MonotoneManager::getThreadForDatabase(const DatabaseFile & database) @@ -71,6 +71,8 @@ MonotoneThread * MonotoneManager::getThr return getThread(database, QString()); } +// FIXME: if there is already a thread "path/to/db.mtn|path/to/workspace" running, +// re-use this if we get at request for "path/to/db.mtn|" MonotoneThread * MonotoneManager::getThread(const DatabaseFile & database, const WorkspacePath & workspace) { QMutexLocker locker(&lock);