Skip to content

Commit 18c2943

Browse files
committed
fixup 2
1 parent 32300ee commit 18c2943

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/desktop/notifications.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ bool available()
5353
#endif
5454
}
5555

56+
#ifdef _WIN32
57+
void send(const std::string&, const std::string&, type)
58+
#else
5659
void send(const std::string& owner, const std::string& message, type t)
60+
#endif
5761
{
5862
// Do not show notifications when the window is visible and has focus
5963
if(video::window_is_visible() && video::window_has_focus()) {

src/sound.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,12 @@ driver_status driver_status::query()
325325

326326
if(mix_ok) {
327327
SDL_AudioSpec* spec;
328-
MIX_GetMixerFormat(mixer, spec);
329-
res.chunk_size = prefs::get().sound_buffer_size();
330-
res.frequency = spec->freq;
331-
res.format = spec->format;
332-
res.channels = spec->channels;
328+
if(MIX_GetMixerFormat(mixer, spec)) {
329+
res.chunk_size = prefs::get().sound_buffer_size();
330+
res.frequency = spec->freq;
331+
res.format = spec->format;
332+
res.channels = spec->channels;
333+
}
333334
}
334335

335336
return res;

src/widgets/textbox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ bool textbox::handle_key_down(const SDL_Event &event)
538538
if((event.key.mod & copypaste_modifier)
539539
//on windows SDL fires for AltGr lctrl+ralt (needed to access @ etc on certain keyboards)
540540
#ifdef _WIN32
541-
&& !(event.key.keysym.mod & SDL_KMOD_ALT)
541+
//&& !(event.key.keysym.mod & SDL_KMOD_ALT)
542542
#endif
543543
) {
544544
switch(c) {

0 commit comments

Comments
 (0)