From 6c835fef3eae2b04598feab5f4c391dd3157c7a7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 20 Jul 2021 19:17:44 -0400 Subject: [PATCH] 2021-07-20 Fred Gleason * Fixed a regression in rdadmin(1) that caused the username and description fields to be blank on the main window. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ rdadmin/rdadmin.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7d88951..7a56f420 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22076,3 +22076,6 @@ 2021-07-20 Fred Gleason * Fixed a bug in rdadmin(1) that threw a SQL error when creating a new matrix device. +2021-07-20 Fred Gleason + * Fixed a regression in rdadmin(1) that caused the username and + description fields to be blank on the main window. diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index c87203df..28752473 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -108,13 +108,11 @@ MainWidget::MainWidget(RDConfig *config,RDWidget *parent) name_label->setGeometry(0,5,sizeHint().width(),20); name_label->setAlignment(Qt::AlignVCenter|Qt::AlignCenter); name_label->setFont(labelFont()); - name_label->setText(tr("User")+": "+rda->user()->name()); QLabel *description_label=new QLabel(this); description_label->setGeometry(0,24,sizeHint().width(),14); description_label->setAlignment(Qt::AlignVCenter|Qt::AlignCenter); name_label->setFont(labelFont()); - description_label->setText(rda->user()->description()); // // Manage Users Button @@ -238,6 +236,8 @@ MainWidget::MainWidget(RDConfig *config,RDWidget *parent) exit(1); } } + name_label->setText(tr("User")+": "+rda->user()->name()); + description_label->setText(rda->user()->description()); users_button->setEnabled(config_priv); groups_button->setEnabled(config_priv); services_button->setEnabled(config_priv);