Skip to content

Added SDL_HINT_APP_NAME#124

Open
upcz wants to merge 4 commits into
projectM-visualizer:masterfrom
upcz:master
Open

Added SDL_HINT_APP_NAME#124
upcz wants to merge 4 commits into
projectM-visualizer:masterfrom
upcz:master

Conversation

@upcz

@upcz upcz commented May 24, 2026

Copy link
Copy Markdown

No description provided.

@kblaschke kblaschke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please amend your commit to remove the comment regarding the ::name() return value, then I can merge the PR.

Comment thread src/SDLRenderingWindow.cpp Outdated
const char* SDLRenderingWindow::name() const
{
return "SDL2 Rendering Window";
return "SDL2 Rendering Window"; // Why..? This isn't used anywhere

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this method must be implemented, please read the docs:
https://docs.pocoproject.org/current/Poco.Util.Subsystem.html#36011

Please remove this comment, then I can merge the PR.

@upcz

upcz commented Jun 3, 2026

Copy link
Copy Markdown
Author

Sorry, I have no idea how to properly work with git (outside school projects), much less github and pull requests.
I hope it works out fine now.

@kblaschke

kblaschke commented Jun 7, 2026

Copy link
Copy Markdown
Member

Sorry, I have no idea how to properly work with git (outside school projects), much less github and pull requests. I hope it works out fine now.

You'd also have to remove the merge commit you've added. Sadly, I can't edit your branch as you've used your master branch for this PR and it is protected. It's always a good idea to create a branch (e.g. using git branch for any changes you want to merge.

So we've got a few options here:

  • You locally squash all four commits into one and then force-push it to GitHub. This may also fail as the master branch is protected and can't normally be forced-pushed to, so you may loosen the branch protection settings for your fork before doing so.
    Thus, I wouldn't recommend this option, but it'll allow to keep the same PR.
  • You close this PR and create a proper branch on the HEAD commit (just use git branch [some branch name here], or git checkout -b [your branch name] master), push the new branch to GitHub and open a new PR. Then I'll be able to edit your branch once the PR is open.
  • You can also create a new branch from the latest master of the upstream repo and redo the change as a new commit to this branch. Then push to GitHub, close this PR and open a new one.
  • I can pull your change into a branch in my repo, close this PR and open a new one in your name. In this case, you'd remain as the commit author, and I'll show up as the committer. Here's how it'll look like: kblaschke@f8bf418

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants