# HG changeset patch # User nemo # Date 1420326885 18000 # Node ID 7fababf10b60d85cd427b29155f75ce760f16a10 # Parent d886f319e7b32921465075652963cf17e0e5e55a oops diff -r d886f319e7b3 -r 7fababf10b60 QTfrontend/model/roomslistmodel.cpp --- a/QTfrontend/model/roomslistmodel.cpp Sat Jan 03 17:27:33 2015 -0500 +++ b/QTfrontend/model/roomslistmodel.cpp Sat Jan 03 18:14:45 2015 -0500 @@ -119,21 +119,21 @@ if (flags.contains("g")) { if (flags.contains("j")) + return QVariant(roomBusyIconRed); + else if (flags.contains("p")) + return QVariant(roomBusyIconGreen); + else + return QVariant(roomBusyIcon); + } + else + { + if (flags.contains("j")) return QVariant(roomWaitingIconRed); else if (flags.contains("p")) return QVariant(roomWaitingIconGreen); else return QVariant(roomWaitingIcon); } - else - { - if (flags.contains("j")) - return QVariant(roomBusyIconRed); - else if (flags.contains("p")) - return QVariant(roomBusyIconGreen); - else - return QVariant(roomBusyIcon); - } } QString content = m_data.at(row).at(column);