Merge branch 'pr-94'

https://github.com/keepassx/keepassx/pull/94

Closes #244
This commit is contained in:
Felix Geyer 2015-07-13 22:36:56 +02:00
commit 274f86fd04

View File

@ -25,6 +25,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QSplitter> #include <QSplitter>
#include <QTimer> #include <QTimer>
#include <QProcess>
#include "autotype/AutoType.h" #include "autotype/AutoType.h"
#include "core/Config.h" #include "core/Config.h"
@ -452,9 +453,18 @@ void DatabaseWidget::openUrl()
void DatabaseWidget::openUrlForEntry(Entry* entry) void DatabaseWidget::openUrlForEntry(Entry* entry)
{ {
if (!entry->url().isEmpty()) { QString urlString = entry->resolvePlaceholders(entry->url());
QDesktopServices::openUrl(entry->url()); if (urlString.isEmpty()) {
return;
} }
if (urlString.startsWith("cmd://") && (urlString.length() > 6)) {
QProcess::startDetached(urlString.mid(6));
}
else {
QDesktopServices::openUrl(urlString);
}
} }
void DatabaseWidget::createGroup() void DatabaseWidget::createGroup()