Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-30 20:34:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash on exit. Fixes #520.

Browse source
This commit is contained in:
Leonardo Zide 2020-10-17 14:41:59 -07:00
parent 5c5e2d8832
commit 6decd02761
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/lc_model.cpp
View file

@ -266,13 +266,7 @@ void lcModel::DeleteModel()
lcReleaseTexture(mBackgroundTexture); lcReleaseTexture(mBackgroundTexture);
mBackgroundTexture = nullptr; mBackgroundTexture = nullptr;
if (mIsPreview && gPreviewWidget) { if (gMainWindow)
lcCamera* Camera = gPreviewWidget->GetCamera();
if (Camera && !Camera->IsSimple() && mCameras.FindIndex(Camera) != -1)
gPreviewWidget->SetCamera(Camera);
}
else if (gMainWindow)
{ {
const lcArray<View*>* Views = gMainWindow->GetViewsForModel(this); const lcArray<View*>* Views = gMainWindow->GetViewsForModel(this);

1
common/lc_partselectionwidget.cpp
View file

@ -716,6 +716,7 @@ void lcPartSelectionListView::PreviewSelection(int InfoIndex)
if (Preview && ViewWidget) if (Preview && ViewWidget)
{ {
ViewWidget->setAttribute(Qt::WA_DeleteOnClose, true);
if (!Preview->SetCurrentPiece(Info->mFileName, ColorCode)) if (!Preview->SetCurrentPiece(Info->mFileName, ColorCode))
QMessageBox::critical(gMainWindow, tr("Error"), tr("Preview %1 failed.").arg(Info->mFileName)); QMessageBox::critical(gMainWindow, tr("Error"), tr("Preview %1 failed.").arg(Info->mFileName));
ViewWidget->SetPreviewPosition(rect()); ViewWidget->SetPreviewPosition(rect());

4
common/lc_previewwidget.cpp
View file

@ -11,8 +11,6 @@
#include "lc_qglwidget.h" #include "lc_qglwidget.h"
lcPreviewWidget* gPreviewWidget;
lcPreviewDockWidget::lcPreviewDockWidget(QMainWindow* Parent) lcPreviewDockWidget::lcPreviewDockWidget(QMainWindow* Parent)
: QMainWindow(Parent) : QMainWindow(Parent)
{ {
@ -104,8 +102,6 @@ lcPreviewWidget::~lcPreviewWidget()
delete mCamera; delete mCamera;
delete mLoader; delete mLoader;
gPreviewWidget = nullptr;
} }
bool lcPreviewWidget::SetCurrentPiece(const QString& PartType, int ColorCode) bool lcPreviewWidget::SetCurrentPiece(const QString& PartType, int ColorCode)

2
common/lc_previewwidget.h
View file

@ -149,5 +149,3 @@ protected:
int mMouseDownX; int mMouseDownX;
int mMouseDownY; int mMouseDownY;
}; };
extern lcPreviewWidget* gPreviewWidget;