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

Fix rdairplay password and rdpanel segfault

Browse Source 
Removes the INSTANCE column from RDAIRPLAY and RDPANEL tables.  This was removed in schema 219 but persists if you create a db from scratch.

This makes rdairplay prompt for a password when exiting and seg faults rdpanel if not removed due to an attempt to insert a record into RDAIRPLAY/RDPANEL without setting a value for INSTANCE which is NOT NULL with no default.
This commit is contained in:
Wayne Merricks 2016-05-24 20:20:55 +01:00
parent db9da6dc62
commit 57aa913e6f
1 changed files with 2 additions and 4 deletions

6
rdadmin/createdb.cpp

@ -1239,7 +1239,6 @@ bool CreateDb(QString name,QString pwd)
sql="create table if not exists RDAIRPLAY (\
ID int not null primary key auto_increment,\
STATION char(40) not null,\
INSTANCE int unsigned not null,\
CARD0 int default 0,\
PORT0 int default 0,\
START_RML0 char(255),\
@ -1351,7 +1350,7 @@ bool CreateDb(QString name,QString pwd)
LOG2_LOG_LINE int default -1,\
LOG2_NOW_CART int unsigned default 0,\
LOG2_NEXT_CART int unsigned default 0,\
index STATION_IDX (STATION,INSTANCE))";
index STATION_IDX (STATION))";
if(!RunQuery(sql)) {
return false;
}
@ -6048,7 +6047,6 @@ int UpdateDb(int ver)
sql="create table if not exists RDPANEL (\
ID int not null primary key auto_increment,\
STATION char(40) not null,\
INSTANCE int unsigned not null,\
CARD2 int default -1,\
PORT2 int default -1,\
START_RML2 char(255),\
@ -6075,7 +6073,7 @@ int UpdateDb(int ver)
FLASH_PANEL enum('N','Y') default 'N',\
PANEL_PAUSE_ENABLED enum('N','Y') default 'N',\
DEFAULT_SERVICE char(10),\
index STATION_IDX (STATION,INSTANCE))";
index STATION_IDX (STATION))";
q=new QSqlQuery(sql);
delete q;