[Windows] RegisterDragDrop に失敗してもエンジン初期化を続行 #1238

Siv3D · Jun 29, 2024 · 78a09e2 · 78a09e2
1 parent 4b8e927
commit 78a09e2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DragDrop/CDragDrop.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DragDrop/CDragDrop.cpp
@@ -741,14 +741,23 @@ namespace s3d
 
 		if (FAILED(::RegisterDragDrop(m_hWnd, m_pDropTarget)))
 		{
-			throw EngineError{ U"RegisterDragDrop() failed" };
+			LOG_WARNING(U"RegisterDragDrop() failed");
+		}
+		else
+		{
+			m_initialized = true;
 		}
 
 		m_pDropTarget->Release();
 	}
 
 	void CDragDrop::update()
 	{
+		if (not m_initialized)
+		{
+			return;
+		}
+
 		const auto status = m_pDropTarget->getStatus();
 
 		const Array<DroppedFilePath>& filePaths = std::get<Array<DroppedFilePath>>(status);
@@ -768,11 +777,21 @@ namespace s3d
 
 	void CDragDrop::acceptFilePaths(const bool accept)
 	{
+		if (not m_initialized)
+		{
+			return;
+		}
+
 		m_pDropTarget->acceptFilePaths(accept);
 	}
 
 	void CDragDrop::acceptText(const bool accept)
 	{
+		if (not m_initialized)
+		{
+			return;
+		}
+
 		m_pDropTarget->acceptText(accept);
 	}
 
@@ -829,13 +848,23 @@ namespace s3d
 
 	void CDragDrop::makeDragDrop(const Array<FilePath>& paths)
 	{
+		if (not m_initialized)
+		{
+			return;
+		}
+
 		std::lock_guard lock{ m_mutex };
 
 		m_newDragPaths = paths;
 	}
 
 	void CDragDrop::process()
 	{
+		if (not m_initialized)
+		{
+			return;
+		}
+
 		Array<FilePath> paths;
 
 		{

diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DragDrop/CDragDrop.hpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DragDrop/CDragDrop.hpp
@@ -57,6 +57,8 @@ namespace s3d
 
 		HWND m_hWnd = nullptr;
 
+		bool m_initialized = false;
+
 		detail::DropTarget* m_pDropTarget = nullptr;
 
 		Array<DroppedFilePath> m_droppedFilePaths;