Merge remote-tracking branch 'origin/master'

2020-10-30 20:51:20 +03:00
parent fb7d4cfa27 9c26063f28
commit 4c8cc733c9
1 changed files with 1 additions and 2 deletions
--- a/src/noggit/MapView.cpp
+++ b/src/noggit/MapView.cpp
@@ -66,7 +66,6 @@
 #include <vector>
 #include <filesystem>

-
 static const float XSENS = 15.0f;
 static const float YSENS = 15.0f;

@@ -1489,7 +1488,7 @@ auto MapView::populateImageModel(QStandardItemModel* model) const -> void
    if(!image.is_directory())
    {
      auto item{new Item{image.path().string().c_str()}};
-      item->setText(image.path().filename().c_str());
+      item->setText(QString::fromStdString(image.path().filename().string()));
      model->appendRow(item);
    }
 }