aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew C <achow101@gmail.com>2016-03-11 11:57:10 -0500
committerAndrew C <achow101@gmail.com>2016-03-11 13:19:19 -0500
commit21e45a097e154be6be4a503f2181896c5f761385 (patch)
tree73b82f0d92768c3536ea54406c7bd3a33d9f8a76
parent0fa88ef784dda77422fdb20b7358803f9b30a5c1 (diff)
downloadbitcoin-21e45a097e154be6be4a503f2181896c5f761385.tar.xz
Fix history deletion bug after font change
The history is no longer cleared after the font size is changed
-rw-r--r--src/qt/rpcconsole.cpp11
-rw-r--r--src/qt/rpcconsole.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 4e2530ffab..90c555ccc8 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -490,16 +490,19 @@ void RPCConsole::setFontSize(int newSize)
// clear console (reset icon sizes, default stylesheet) and re-add the content
float oldPosFactor = 1.0 / ui->messagesWidget->verticalScrollBar()->maximum() * ui->messagesWidget->verticalScrollBar()->value();
- clear();
+ clear(false);
ui->messagesWidget->setHtml(str);
ui->messagesWidget->verticalScrollBar()->setValue(oldPosFactor * ui->messagesWidget->verticalScrollBar()->maximum());
}
-void RPCConsole::clear()
+void RPCConsole::clear(bool clearHistory)
{
ui->messagesWidget->clear();
- history.clear();
- historyPtr = 0;
+ if(clearHistory)
+ {
+ history.clear();
+ historyPtr = 0;
+ }
ui->lineEdit->clear();
ui->lineEdit->setFocus();
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 648e32638f..b7a786822b 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -77,7 +77,7 @@ private Q_SLOTS:
void clearSelectedNode();
public Q_SLOTS:
- void clear();
+ void clear(bool clearHistory = true);
void fontBigger();
void fontSmaller();
void setFontSize(int newSize);