commit ba9a4fc5e2ac4cbdf8b5b7917bf61753fe2a25c2
Merge: 4abf58cf 73a90031
Author:     Alex Mayfield <alexmax2742@gmail.com>
AuthorDate: Wed Mar 8 22:51:15 2017 -0500
Commit:     Alex Mayfield <alexmax2742@gmail.com>
CommitDate: Wed Mar 8 22:51:15 2017 -0500

    Merge remote-tracking branch 'me/chocolate-midivolume' into chocolate-midivolume

    # Conflicts:
    #       src/i_midipipe.c

 src/i_midipipe.c | 21 ++++++++++++---------
 src/i_midipipe.h |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --cc src/i_midipipe.c
index 7ea003be,81e5a64b..89b7307f
--- a/src/i_midipipe.c
+++ b/src/i_midipipe.c
@@@ -435,8 -438,8 +438,8 @@@ boolean I_MidiPipe_InitServer(
      startup_info.hStdOutput = midi_process_out_writer;
      startup_info.dwFlags = STARTF_USESTDHANDLES;

-     BOOL ok = CreateProcess(TEXT(module), TEXT(cmdline), NULL, NULL, TRUE,
+     ok = CreateProcess(TEXT(module), TEXT(cmdline), NULL, NULL, TRUE,
 -        CREATE_NEW_CONSOLE, NULL, NULL, &startup_info, &proc_info);
 +        0, NULL, NULL, &startup_info, &proc_info);

      if (!ok)
      {