Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-24 17:37:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-rdsoftkeys'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-23 15:00:27 -04:00
commit 4c8b6ad0b8
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18681,3 +18681,6 @@
2019-05-19 Patrick Linstruth <patrick@deltecent.com> 2019-05-19 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in 'RDCartDialog' that caused an empty scheduler code * Fixed bug in 'RDCartDialog' that caused an empty scheduler code
dropdown box. dropdown box.
2019-05-23 Patrick Linstruth <patrick@deltecent.com>
* Display error dialog in rdsoftkeys(1) if no defintions are
found in map file.

11
utils/rdsoftkeys/rdsoftkeys.cpp
View File

@ -157,6 +157,17 @@ MainWidget::MainWidget(QWidget *parent)
} }
n++; n++;
} }
//
// If no softkeys have been defined, gracefully exit
//
if (!key_macros.size()) {
QMessageBox::critical(this, tr("RDSoftKeys"),
tr(QString("No SoftKey definitions found in file\n%1")
.arg(map_filename)));
exit(1);
}
if((key_macros.size()%key_columns)==0) { if((key_macros.size()%key_columns)==0) {
key_ysize-=60; key_ysize-=60;
} }