From d870aaf59eb31fdee8099cf4cef03152e418be78 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 11 Feb 2012 09:38:40 +0100
Subject: Let "Manually load Plugins" work again

Courtesy patch by: Dominik Cermak. Thanks :)

BUG:293761
---
 src/webpluginfactory.cpp | 4 ++--
 src/webpluginfactory.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index c0cfceee..7713c74b 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
@@ -64,7 +64,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
 
     case 1:
         if (mimeType != QString("application/x-shockwave-flash")
-                || mimeType != QString("application/futuresplash"))
+                && mimeType != QString("application/futuresplash"))
             break;
 
         if (_loadClickToFlash)
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 98172887..b1bcd967 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
-- 
cgit v1.2.1