diff options
| author | John Ankarström <john@ankarstrom.se> | 2022-07-20 02:12:32 +0200 |
|---|---|---|
| committer | John Ankarström <john@ankarstrom.se> | 2022-07-20 02:12:32 +0200 |
| commit | df42108d1f4c1628fe62874e48e87282fab6bc65 (patch) | |
| tree | 76589bd39abd7ec180a9928d49325dbee5d2562b /c/episodelistview.cpp | |
| parent | 4da9280a307ced3fab399d655b9d11330fc33bc4 (diff) | |
| download | EpisodeBrowser-df42108d1f4c1628fe62874e48e87282fab6bc65.tar.gz | |
Fix bug in and rename throw_nil, warn_nil.
In warn_nil, the return value was undefined on exception -- I think.
While informative, the names throw_nil and warn_nil don't work very
well in conditionals:
if (warn_nil<f>(...)) g();
sounds like g should be called if f returns nil and a warning is
issued. But it is actually the other way around; g is called if f is
successful.
if (prefer<f>(...)) g();
sounds less like that.
Diffstat (limited to 'c/episodelistview.cpp')
| -rw-r--r-- | c/episodelistview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/c/episodelistview.cpp b/c/episodelistview.cpp index e70cc06..6ed9146 100644 --- a/c/episodelistview.cpp +++ b/c/episodelistview.cpp @@ -90,7 +90,7 @@ LRESULT EpisodeListView::HandleNotify(const LPARAM lParam) { extern HFONT g_hfBold; if (!Pl("track_episodes","watched",pLvCd->nmcd.lItemlParam)) { - throw_nil<SelectObject>(pLvCd->nmcd.hdc, g_hfBold); + require<SelectObject>(pLvCd->nmcd.hdc, g_hfBold); return CDRF_NEWFONT; } break; @@ -125,7 +125,7 @@ LRESULT EpisodeListView::HandleNotify(const LPARAM lParam) { extern HMENU g_hPopupMenu; const DWORD dwPos = GetMessagePos(); - throw_nil<TrackPopupMenu>(g_hPopupMenu, TPM_RIGHTBUTTON, + require<TrackPopupMenu>(g_hPopupMenu, TPM_RIGHTBUTTON, LOWORD(dwPos), HIWORD(dwPos), 0, m_hWndParent, (const RECT*)NULL); break; |