linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3205
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2013-02-12 20:16:15 +0100
message:
  Fix problems after marking oneself as a favorite user
modified:
  changelog.txt
  dcpp/ClientManager.cpp
  dcpp/SettingsManager.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2013-02-03 22:26:48 +0000
+++ changelog.txt	2013-02-12 19:16:15 +0000
@@ -1,5 +1,6 @@
 * Fix status bar parts when the window is too small (poy)
 * [L#534440] [NMDC] Preserve encodings in some search results (poy)
+* [ADC] Fix problems after marking oneself as a favorite user
 
 -- 0.810 2013-01-30 --
 * Fix a race condition on file list download (thanks bigmuscle)

=== modified file 'dcpp/ClientManager.cpp'
--- dcpp/ClientManager.cpp	2013-02-04 18:42:31 +0000
+++ dcpp/ClientManager.cpp	2013-02-12 19:16:15 +0000
@@ -279,6 +279,10 @@
 		return ui->second;
 	}
 
+	if(cid == getMe()->getCID()) {
+		return getMe();
+	}
+
 	UserPtr p(new User(cid));
 	users.emplace(cid, p);
 	return p;

=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2013-01-24 22:53:46 +0000
+++ dcpp/SettingsManager.cpp	2013-02-12 19:16:15 +0000
@@ -515,7 +515,7 @@
 		else if(SETTING(AUTO_SEARCH_LIMIT) < 1)
 			set(AUTO_SEARCH_LIMIT, 1);
 
-#ifdef _DEBUG
+#ifdef DCPP_REGEN_CID
 		set(PRIVATE_ID, CID::generate().toBase32());
 #endif