# # # patch "src/monotone/MonotoneThread.cpp" # from [c14d137aa0b5fe493aff2945ed43e40080e92a0d] # to [08883e65cab05f04143b8c06e362bc7b7d4cfac7] # # patch "src/monotone/MonotoneThread.h" # from [f8d8df1ec8f103893babbaf00a411e89fb7d374c] # to [bcdcc6b9ea9e6425419793182d1fc5541716f243] # ============================================================ --- src/monotone/MonotoneThread.cpp c14d137aa0b5fe493aff2945ed43e40080e92a0d +++ src/monotone/MonotoneThread.cpp 08883e65cab05f04143b8c06e362bc7b7d4cfac7 @@ -278,8 +278,7 @@ void MonotoneThread::abort() // FIXME: I think we need to care somehow if we pass // threads around - i.e. use shared ptrs or something -MonotoneThread * MonotoneThreadManager::getThread( - const QString & database, const QString & workspace = QString()) +MonotoneThread * MonotoneThreadManager::getThread(const QString & database, const QString & workspace) { if (!threadMap.contains(database)) { ============================================================ --- src/monotone/MonotoneThread.h f8d8df1ec8f103893babbaf00a411e89fb7d374c +++ src/monotone/MonotoneThread.h bcdcc6b9ea9e6425419793182d1fc5541716f243 @@ -121,7 +121,7 @@ public: QString getDatabaseFilePath(const QString &); QString normalizeWorkspacePath(const QString &); - MonotoneThread * getThread(const QString &, const QString &); + MonotoneThread * getThread(const QString &, const QString & workspace = QString()); private: QMap threadMap;