Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix web export state for Remote Debug #92163

Merged
merged 1 commit into from
Jun 26, 2024

Conversation

adamscott
Copy link
Member

Fixes #92162 and simplifies the export plugin code (no need to resort converting a boolean to an int, then incrementing it).

@adamscott adamscott marked this pull request as ready for review May 20, 2024 15:04
@adamscott adamscott requested a review from a team as a code owner May 20, 2024 15:04
@adamscott adamscott added this to the 4.4 milestone May 20, 2024
@adamscott adamscott force-pushed the fix-new-web-export-bug branch 2 times, most recently from 7ea34f6 to 42a4e1c Compare May 20, 2024 15:18
@adamscott adamscott changed the title Fix web export state for remote debug Fix web export state for Remote Debug May 20, 2024
@adamscott adamscott force-pushed the fix-new-web-export-bug branch 2 times, most recently from 8c266ea to fa26281 Compare May 23, 2024 16:25
@akien-mga
Copy link
Member

For the record there's still time to merge this kind of bugfix in 4.3, especially as it's (partially?) a regression fix compared to 4.2, IINM.

@adamscott adamscott modified the milestones: 4.4, 4.3 May 23, 2024
@akien-mga akien-mga added the bug label May 23, 2024
@patwork

This comment was marked as resolved.

@adamscott adamscott force-pushed the fix-new-web-export-bug branch 2 times, most recently from 50b00b9 to e0181db Compare May 27, 2024 15:06
@adamscott
Copy link
Member Author

web debug icon activates even if only release template is added, but I think bug (?) is in /editor/export/editor_export_platform.cpp

-- @patwork in the developers chat

I investigated the issue and it is a bug, a bug even shared with other exporters. But my quick fix leads to other issues, such as the export buttons being greyed out even if there's a valid debug template.

@akien-mga, I suggest that we merge this PR, and I'll create an issue on the tracker about the reported bug. I don't think it's urgent to fix this issue for 4.3.

@adamscott
Copy link
Member Author

But my quick fix leads to other issues, such as the export buttons being greyed out even if there's a valid debug template.

The quick fix in question is this one:

diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp
index d83e465e8e..dd7235bc6e 100644
--- a/platform/web/export/export_plugin.cpp
+++ b/platform/web/export/export_plugin.cpp
@@ -413,7 +413,7 @@ bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref<EditorExp
 		}
 	}
 
-	valid = dvalid || rvalid;
+	valid = (p_debug && dvalid) || (!p_debug && rvalid);
 	r_missing_templates = !valid;
 
 	if (!err.is_empty()) {

@akien-mga akien-mga merged commit df78d0d into godotengine:master Jun 26, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remote Debug for web exports is sometimes wrong
3 participants