From b5dd9141a3a73e033f11dfa88dda944f6dbc08be Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 25 Jul 2014 16:12:40 -0700 Subject: [PATCH] Fix the double entries in models' browsers --- examples/editModels.js | 2 +- interface/src/ui/ModelsBrowser.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/editModels.js b/examples/editModels.js index ea88c87bea..abb0c4c56e 100644 --- a/examples/editModels.js +++ b/examples/editModels.js @@ -804,7 +804,7 @@ function mousePressEvent(event) { } } else if (browser == toolBar.clicked(clickedOverlay)) { - var url = Window.s3Browse(); + var url = Window.s3Browse(".*(fbx|FBX)"); if (url == null || url == "") { return; } diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index 41dea69581..5e107677f0 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -182,7 +182,7 @@ ModelHandler::ModelHandler(ModelType modelsType, QWidget* parent) : QObject(parent), _initiateExit(false), _type(modelsType), - _nameFilter(".*(fst|fbx|FST|FBX)") + _nameFilter(".*fst") { // set headers data QStringList headerData; @@ -253,7 +253,6 @@ void ModelHandler::downloadFinished() { parseHeaders(reply); } reply->deleteLater(); - sender()->deleteLater(); } void ModelHandler::queryNewFiles(QString marker) {