merge fixes
This commit is contained in:
parent
9b67b0b18d
commit
e6c564a373
1 changed files with 2 additions and 2 deletions
|
@ -329,8 +329,8 @@ lvwClients->setMinimumHeight ( 140 );
|
||||||
edtCurrentSessionDir->setText ( "" );
|
edtCurrentSessionDir->setText ( "" );
|
||||||
pbtNewRecording->setAutoDefault ( false );
|
pbtNewRecording->setAutoDefault ( false );
|
||||||
pbtRecordingDir->setAutoDefault ( false );
|
pbtRecordingDir->setAutoDefault ( false );
|
||||||
edtRecordingDir->setText( pServer->GetRecordingDir() );
|
edtRecordingDir->setText ( pServer->GetRecordingDir() );
|
||||||
tbtClearRecordingDir->setText(QString::fromUtf8("\u232B"));
|
tbtClearRecordingDir->setText ( u8"\u232B" );
|
||||||
|
|
||||||
UpdateRecorderStatus ( QString::null );
|
UpdateRecorderStatus ( QString::null );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue