From e6c564a373c7c42abc006c7cb589931a75bc6b02 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 4 Jul 2020 19:11:59 +0200
Subject: [PATCH] merge fixes

---
 src/serverdlg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 1ff9cd5b..6ce0193d 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -329,8 +329,8 @@ lvwClients->setMinimumHeight ( 140 );
     edtCurrentSessionDir->setText ( "" );
     pbtNewRecording->setAutoDefault ( false );
     pbtRecordingDir->setAutoDefault ( false );
-    edtRecordingDir->setText( pServer->GetRecordingDir() );
-    tbtClearRecordingDir->setText(QString::fromUtf8("\u232B"));
+    edtRecordingDir->setText ( pServer->GetRecordingDir() );
+    tbtClearRecordingDir->setText ( u8"\u232B" );
 
     UpdateRecorderStatus ( QString::null );