diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aoemotebutton.cpp | 5 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/aoemotebutton.cpp b/src/aoemotebutton.cpp index 652010d2..07e6a42c 100644 --- a/src/aoemotebutton.cpp +++ b/src/aoemotebutton.cpp @@ -25,7 +25,10 @@ void AOEmoteButton::set_image(QString p_image, QString p_emote_comment) "\") 0 0 0 0 stretch stretch; }" "QToolTip { color: #000000; background-color: #ffffff; border: 0px; }"); } - else if (p_image.contains("_on") && file_exists(tmp_p_image.replace("_on", "_off"))) { + else if ((p_image.contains("_on") && + file_exists(tmp_p_image.replace("_on", "_off"))) || + (p_image.contains("_off") && + file_exists(tmp_p_image.replace("_off", "_on")))) { QImage tmpImage(tmp_p_image); tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32); QPoint p1, p2; diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 15cb31b0..7819cd50 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -286,7 +286,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet) if (AOApplication::get_auto_logging_enabled()) { this->log_filename = QDateTime::currentDateTime().toUTC().toString( "'logs/" + server_name.remove(QRegExp("[\\\\/:*?\"<>|\']")) + - "/'ddd MMMM yyyy hh.mm.ss t'.log'"); + "/'yyyy-MM-dd hh-mm-ss t'.log'"); this->write_to_file("Joined server " + server_name + " on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), |