History

CR and fix deadlock

SamGondelman committed 7 years ago

Commit 3f8bfc51 parent b418e436 files · +8 −12Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1900,11 +1900,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1899 unmodified lines
1900 connect(pointerManager.data(), &PointerManager::triggerBeginOverlay, keyboardFocusOperator);1900 connect(pointerManager.data(), &PointerManager::triggerBeginOverlay, keyboardFocusOperator);
1901 1901
1902 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();1902 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
1903 connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, [this](const EntityItemID& entityItemID) {1903 connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityItemID) {
1904 if (entityItemID == _keyboardFocusedEntity.get()) {1904 if (entityItemID == _keyboardFocusedEntity.get()) {
1905 setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);1905 setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
1906 }1906 }
1907 });1907 }, Qt::QueuedConnection);
1908 1908
1909 EntityTree::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {1909 EntityTree::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
1910 if (_aboutToQuit) {1910 if (_aboutToQuit) {

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