Merge pull request #3215 from Atlante45/master

Fix the double entries in models' browsers
This commit is contained in:
Brad Hefta-Gaub 2014-07-28 08:51:49 -07:00
commit f438ae2ddb
2 changed files with 2 additions and 3 deletions

View file

@ -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;
}

View file

@ -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) {