Skip to content

Parts of PR #1994 (wrong display of Unicode characters at line wrap) got lost #2274

@hoffie

Description

@hoffie

Describe the bug

TruncateString() in src/util.cpp is currently unused and generates a compiler warning on Mac due to this.
This function was initially introduced in ce370e9 via #1994, master merge commit 5158996. While the function is still there, all the other code from this commit is missing.

I suspect that a (later) bad merge has caused this.

After lots of tracing directly on master, I had a look at the PR's commits again and something seems fishy there:

  • ce370e9 adds TruncateString + the call in src/util.cpp (as expected)
  • a8853b6 is a merge commit which still contains the function definition, but lacks any call of the function

So, I believe that the merge commit unwittingly dropped the call. This is no surprise though, as the merge commit likely had severe conflicts to do a parallel huge code reorganization through d94fd69, which moved CMusProfDlg::OnAliasTextChanged (where the lost change was) to CClientSettingsDlg::OnAliasTextChanged.

Version of Jamulus

master @ 2501880

Additional context

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions