History

Fix threaded force crashes

Clement committed 8 years ago

Commit bd59ff11 parent f2c38a71 file · +6 −6Browse files

Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Menu.cpp+6−6
@@ -749,32 +749,32 @@ Menu::Menu() { · 748 unmodified lines
749 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);749 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
750 connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });750 connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
751 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);751 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);
752 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::pureVirtualCall(); }); });752 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::pureVirtualCall).join(); });
753 753
754 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);754 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);
755 connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });755 connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });
756 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);756 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);
757 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::doubleFree(); }); });757 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doubleFree).join(); });
758 758
759 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);759 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);
760 connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });760 connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });
761 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);761 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);
762 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::doAbort(); }); });762 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doAbort).join(); });
763 763
764 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);764 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);
765 connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });765 connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });
766 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);766 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);
767 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::nullDeref(); }); });767 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::nullDeref).join(); });
768 768
769 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);769 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);
770 connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });770 connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });
771 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);771 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);
772 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::outOfBoundsVectorCrash(); }); });772 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::outOfBoundsVectorCrash).join(); });
773 773
774 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);774 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);
775 connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });775 connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });
776 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);776 action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
777 connect(action, &QAction::triggered, qApp, []() { std::thread([]() { crash::newFault(); }); });777 connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
778 778
779 // Developer > Log...779 // Developer > Log...
780 addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L,780 addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t