From: Bas Pape <baspape@gmail.com>
Date: Wed, 10 Oct 2012 20:53:51 +0000 (+0200)
Subject: Set key and cert for the temp identity manually
X-Git-Tag: 0.9-beta1~14
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1290b01bc264201c31d5e42b94b07ced052cf05d

Set key and cert for the temp identity manually

Normally these are synced, but in this case they need to be set manually
for hasChanged to work.

Fixes #1032
---

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index 094e9e00..4d2d433c 100644
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -175,6 +175,11 @@ bool IdentitiesSettingsPage::testHasChanged()
         if (currentId != 0) {
             changedIdentities.removeAll(currentId);
             CertIdentity temp(currentId, this);
+            // we need to set the cert and key manually, as they aren't synced
+            CertIdentity *old = identities[currentId];
+            temp.setSslKey(old->sslKey());
+            temp.setSslCert(old->sslCert());
+
             ui.identityEditor->saveToIdentity(&temp);
             temp.setIdentityName(identities[currentId]->identityName());
             if (temp != *Client::identity(currentId) || temp.isDirty())