forked from pool/krusader
67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
|
From: Jan Lepper <jan_lepper@gmx.de>
|
||
|
|
Date: Tue, 30 Oct 2012 21:15:43 +0000
|
||
|
|
Subject: FIXED: [ 309159 ] Crash in video files preview on F3
|
||
|
|
X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=770fa41c1f8e76d91eb981ee56d972efe10dc667
|
||
|
|
---
|
||
|
|
FIXED: [ 309159 ] Crash in video files preview on F3
|
||
|
|
remove unnecessary code that possibly
|
||
|
|
- causes infinite recursion
|
||
|
|
- uses an invalid KUrl object
|
||
|
|
BUG: 309159
|
||
|
|
---
|
||
|
|
|
||
|
|
|
||
|
|
--- a/krusader/KViewer/krviewer.cpp
|
||
|
|
+++ b/krusader/KViewer/krviewer.cpp
|
||
|
|
@@ -534,11 +534,6 @@
|
||
|
|
if (!pvb->part())
|
||
|
|
return;
|
||
|
|
|
||
|
|
- //FIXME this belongs to PanelViewer
|
||
|
|
- if (!pvb->part()->url().equals(pvb->url(), KUrl::CompareWithoutTrailingSlash)) {
|
||
|
|
- pvb->setUrl(pvb->part()->url());
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
int ndx = tabBar.indexOf(pvb);
|
||
|
|
tabBar.setTabText(ndx, makeTabText(pvb));
|
||
|
|
tabBar.setTabIcon(ndx, makeTabIcon(pvb));
|
||
|
|
|
||
|
|
--- a/krusader/KViewer/panelviewer.cpp
|
||
|
|
+++ b/krusader/KViewer/panelviewer.cpp
|
||
|
|
@@ -214,9 +214,9 @@
|
||
|
|
|
||
|
|
KParts::ReadOnlyPart* PanelViewer::openUrl(const KUrl &url, KrViewer::Mode mode)
|
||
|
|
{
|
||
|
|
- emit urlChanged(this, url);
|
||
|
|
closeUrl();
|
||
|
|
curl = url;
|
||
|
|
+ emit urlChanged(this, url);
|
||
|
|
|
||
|
|
KMimeType::Ptr mt = KMimeType::findByUrl(url);
|
||
|
|
QString mimetype = mt->name();
|
||
|
|
@@ -328,9 +328,9 @@
|
||
|
|
|
||
|
|
KParts::ReadOnlyPart* PanelEditor::openUrl(const KUrl &url, KrViewer::Mode mode)
|
||
|
|
{
|
||
|
|
- emit urlChanged(this, url);
|
||
|
|
closeUrl();
|
||
|
|
curl = url;
|
||
|
|
+ emit urlChanged(this, url);
|
||
|
|
|
||
|
|
KFileItem item = readFileInfo(url);
|
||
|
|
KIO::filesize_t fileSize = item.isNull() ? 0 : item.size();
|
||
|
|
|
||
|
|
--- a/krusader/KViewer/panelviewer.h
|
||
|
|
+++ b/krusader/KViewer/panelviewer.h
|
||
|
|
@@ -41,9 +41,6 @@
|
||
|
|
virtual ~PanelViewerBase();
|
||
|
|
inline KUrl url() const {
|
||
|
|
return curl;
|
||
|
|
- }
|
||
|
|
- inline void setUrl(KUrl url) {
|
||
|
|
- emit urlChanged(this, url); curl = url;
|
||
|
|
}
|
||
|
|
inline KParts::ReadOnlyPart* part() const {
|
||
|
|
return cpart;
|
||
|
|
|