Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-27 14:41:45 +02:00
Code Issues Projects Releases Wiki Activity

2018-08-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdadmin(1) that failed to close the program after
	a failed login.
This commit is contained in:
Fred Gleason 2018-08-20 08:56:38 -04:00
parent 9195a5afa1
commit e35a8f28b1
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17497,3 +17497,6 @@
* Changed column headings to lower-case in rdlogmanager(1). * Changed column headings to lower-case in rdlogmanager(1).
2018-08-20 Fred Gleason <fredg@paravelsystems.com> 2018-08-20 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rivendell_filter(1) that caused a segfault. * Fixed a regression in rivendell_filter(1) that caused a segfault.
2018-08-20 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdadmin(1) that failed to close the program after
a failed login.

4
rdadmin/login.cpp
View File

@ -136,13 +136,13 @@ void Login::okData()
{ {
*login_name=login_name_edit->text(); *login_name=login_name_edit->text();
*login_password=login_password_edit->text(); *login_password=login_password_edit->text();
done(0); done(true);
} }
void Login::cancelData() void Login::cancelData()
{ {
done(1); done(false);
} }

6
rdadmin/rdadmin.cpp
View File

@ -123,19 +123,19 @@ MainWidget::MainWidget(QWidget *parent)
// Log In // Log In
// //
Login *login=new Login(&admin_username,&admin_password,this); Login *login=new Login(&admin_username,&admin_password,this);
if(login->exec()!=0) { if(!login->exec()) {
exit(0); exit(0);
} }
rda->user()->setName(admin_username); rda->user()->setName(admin_username);
if(!rda->user()->checkPassword(admin_password,false)) { if(!rda->user()->checkPassword(admin_password,false)) {
QMessageBox::warning(this,"Login Failed","Login Failed!.\n"); QMessageBox::warning(this,"Login Failed","Login Failed!.\n");
exiting=true; exit(1);
} }
else { else {
if(!rda->user()->adminConfig()) { if(!rda->user()->adminConfig()) {
QMessageBox::warning(this,tr("Insufficient Priviledges"), QMessageBox::warning(this,tr("Insufficient Priviledges"),
tr("This account has insufficient priviledges for this operation.")); tr("This account has insufficient priviledges for this operation."));
exiting=true; exit(1);
} }
} }