Ticket #4913: kde_bug309159.diff

File kde_bug309159.diff, 2.4 KB (added by Miklos Karacsony, 10 years ago)

Patch - 2

  • ChangeLog 

    commit 770fa41c1f8e76d91eb981ee56d972efe10dc667
Author: Jan Lepper <jan_lepper@gmx.de>
Date:   Tue Oct 30 22:15:43 2012 +0100

    FIXED: [ 309159 ] Crash in video files preview on F3
    remove unnecessary code that possibly
     - causes infinite recursion
     - uses an invalid KUrl object
    BUG: 309159

diff --git a/ChangeLog b/ChangeLog
index d12914d..8986c11 100644
    a b  
     1    FIXED: [ 309159 ] Crash in video files preview on F3
     2
     3
    142.4.0-beta3 "Single Step"
    25=========================
    36

  • krusader/KViewer/krviewer.cpp 

    diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
index 428d114..fa0cebd 100644
    a b void KrViewer::refreshTab(PanelViewerBase* pvb)  
    534534    if (!pvb->part())
    535535        return;
    536536
    537     //FIXME this belongs to PanelViewer
    538     if (!pvb->part()->url().equals(pvb->url(), KUrl::CompareWithoutTrailingSlash)) {
    539         pvb->setUrl(pvb->part()->url());
    540     }
    541 
    542537    int ndx = tabBar.indexOf(pvb);
    543538    tabBar.setTabText(ndx, makeTabText(pvb));
    544539    tabBar.setTabIcon(ndx, makeTabIcon(pvb));

  • krusader/KViewer/panelviewer.cpp 

    diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index 42f7f3a..24ce2b3 100644
    a b KParts::ReadOnlyPart* PanelViewer::getDefaultPart(const KUrl &url, QString mimet  
    214214
    215215KParts::ReadOnlyPart* PanelViewer::openUrl(const KUrl &url, KrViewer::Mode mode)
    216216{
    217     emit urlChanged(this, url);
    218217    closeUrl();
    219218    curl = url;
     219    emit urlChanged(this, url);
    220220
    221221    KMimeType::Ptr mt = KMimeType::findByUrl(url);
    222222    QString mimetype = mt->name();
    … … QString PanelEditor::missingKPartMsg()  
    328328
    329329KParts::ReadOnlyPart* PanelEditor::openUrl(const KUrl &url, KrViewer::Mode mode)
    330330{
    331     emit urlChanged(this, url);
    332331    closeUrl();
    333332    curl = url;
     333    emit urlChanged(this, url);
    334334
    335335    KFileItem item = readFileInfo(url);
    336336    KIO::filesize_t fileSize = item.isNull() ? 0 : item.size();

  • krusader/KViewer/panelviewer.h 

    diff --git a/krusader/KViewer/panelviewer.h b/krusader/KViewer/panelviewer.h
index 4fe844e..c1b76fb 100644
    a b public:  
    4242    inline KUrl url() const {
    4343        return curl;
    4444    }
    45     inline void setUrl(KUrl url) {
    46         emit urlChanged(this, url); curl = url;
    47     }
    4845    inline KParts::ReadOnlyPart* part() const {
    4946        return cpart;
    5047    }