From 12ff31111421905ea2a8f4f927fd353df945371c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Oct 2014 23:44:30 +0400
Subject: [PATCH] fixed settings on restart

---
 Telegram/SourceFiles/boxes/usernamebox.cpp | 2 +-
 Telegram/SourceFiles/settingswidget.cpp    | 2 ++
 Telegram/SourceFiles/settingswidget.h      | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/usernamebox.cpp b/Telegram/SourceFiles/boxes/usernamebox.cpp
index 4bac482ce..a38bce9ce 100644
--- a/Telegram/SourceFiles/boxes/usernamebox.cpp
+++ b/Telegram/SourceFiles/boxes/usernamebox.cpp
@@ -207,7 +207,7 @@ void UsernameBox::onUpdateDone(const MTPUser &user) {
 bool UsernameBox::onUpdateFail(const RPCError &error) {
 	_saveRequest = 0;
 	QString err(error.type()), name = getName();
-	if (err == "USERNAME_NOT_MODIFIED") {
+	if (err == "USERNAME_NOT_MODIFIED" || _sentUsername == textOneLine(name)) {
 		App::self()->setName(textOneLine(App::self()->firstName), textOneLine(App::self()->lastName), textOneLine(App::self()->nameOrPhone), textOneLine(name));
 		emit closed();
 		return true;
diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp
index 2320d20e2..fecfd6cd7 100644
--- a/Telegram/SourceFiles/settingswidget.cpp
+++ b/Telegram/SourceFiles/settingswidget.cpp
@@ -97,6 +97,8 @@ bool scaleIs(DBIScale scale) {
 }
 
 SettingsInner::SettingsInner(SettingsWidget *parent) : QWidget(parent),
+	_self(App::self()),
+
 	// profile
 	_nameCache(self() ? self()->name : QString()),
     _uploadPhoto(this, lang(lng_settings_upload), st::btnSetUpload),
diff --git a/Telegram/SourceFiles/settingswidget.h b/Telegram/SourceFiles/settingswidget.h
index 9d16632da..2b335c2d7 100644
--- a/Telegram/SourceFiles/settingswidget.h
+++ b/Telegram/SourceFiles/settingswidget.h
@@ -147,8 +147,9 @@ private:
 
 	void setScale(DBIScale newScale);
 
+	UserData *_self;
 	UserData *self() const {
-		return App::self();
+		return App::self() ? _self : static_cast<UserData*>(0);
 	}
 	int32 _left;