From: Ben Rosser <rosser.bjr@gmail.com>
Date: Sat, 27 May 2017 18:19:09 +0000 (-0400)
Subject: Fix issue from rebase; migrateTo now needs writer.get().
X-Git-Tag: travis-deploy-test~265
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=878c4bdcdd8c1cc3347470ac3d8b9a9569b1a3dc;ds=sidebyside

Fix issue from rebase; migrateTo now needs writer.get().
---

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 1a418f1d..889d15af 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -862,7 +862,7 @@ bool Core::selectBackend(const QString &backend)
         qDebug() << qPrintable(tr("Migrating storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName()));
         _storage.reset();
         storage.reset();
-        if (reader->migrateTo(writer)) {
+        if (reader->migrateTo(writer.get())) {
             qDebug() << "Migration finished!";
             qDebug() << qPrintable(tr("Migration finished!"));
             if (!saveBackendSettings(backend, settings)) {