Some fixes for Mac OS file opening

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@301 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 16 years ago
parent 2ffd4a6fba
commit 212f3ac464
  1. 12
      src/main.cpp

@ -193,6 +193,7 @@ int main(int argc, char **argv)
installTranslator();
#ifdef Q_WS_MAC
QApplication::processEvents();
if (args.file().isEmpty() && !eventListener->file().isEmpty()) {
args.setFile(eventListener->file());
}
@ -301,10 +302,15 @@ bool EventListener::eventFilter(QObject*, QEvent* event){
#ifdef Q_WS_MAC
if (event->type() == QEvent::FileOpen) {
QString filename = static_cast<QFileOpenEvent*>(event)->file();
if (pMainWindow)
pMainWindow->openFile(filename);
else
if (pMainWindow) {
if (QApplication::activeModalWidget() == NULL)
pMainWindow->openFile(filename);
else
return true; // ignore file open events while a modal dialog is displayed
}
else {
pFile = filename;
}
}
#endif