Skip to content

Commit 0e8942a

Browse files
Fix Pin Planner crash (#1710)
* Fix Pin Planner crash * Incremented patch version --------- Co-authored-by: alaindargelas <alaindargelas@users.noreply.github.com>
1 parent daf2e2c commit 0e8942a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(VERSION_MINOR 0)
3939
# Add the spdlog directory to the include path
4040
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk ${CMAKE_CURRENT_SOURCE_DIR}/third_party/scope_guard)
4141

42-
set(VERSION_PATCH 431)
42+
set(VERSION_PATCH 432)
4343

4444

4545
option(

src/MainWindow/main_window.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -897,9 +897,7 @@ void MainWindow::createMenus() {
897897

898898
toolsMenu = menuBar()->addMenu("&Tools");
899899
toolsMenu->addAction(ipConfiguratorAction);
900-
#ifndef PRODUCTION_BUILD
901900
toolsMenu->addAction(pinAssignmentAction);
902-
#endif
903901
toolsMenu->addAction(programmerAction);
904902
toolsMenu->addAction(eFpgaConfigurator);
905903

@@ -914,9 +912,7 @@ void MainWindow::createMenus() {
914912
helpMenu->addAction(compressProjectAction);
915913

916914
preferencesMenu->addAction(defualtProjectPathAction);
917-
#ifndef PRODUCTION_BUILD
918915
preferencesMenu->addAction(pinPlannerPinNameAction);
919-
#endif
920916
preferencesMenu->addAction(editorSettingsAction);
921917
preferencesMenu->addAction(showWelcomePageAction);
922918
preferencesMenu->addAction(stopCompileMessageAction);

src/PinAssignment/PinAssignmentBaseView.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ void PinAssignmentBaseView::insertCombo(QComboBox *combo,
109109
}
110110

111111
void PinAssignmentBaseView::removeFromList(QObject *obj) {
112-
m_allCombo.remove(qobject_cast<QComboBox *>(obj));
112+
// Bug: qobject_cast<QComboBox*> returns 0 now the type is ComboBox
113+
// Use brute force cast for now.
114+
m_allCombo.remove((QComboBox *)obj);
113115
}
114116

115117
} // namespace FOEDAG

0 commit comments

Comments
 (0)