comparison: pidgin/win32/winpidgin.c
pidgin/win32/winpidgin.c
- changeset 18769
- 366db54481aa
- parent 17186
- d9e4730db4b6
- child 18770
- 19fd340ce715
equal
deleted
inserted
replaced
| 18768:c8ae7c5d1ad0 | 18769:366db54481aa |
|---|---|
| 584 if (!getenv("PIDGIN_NO_DLL_CHECK")) | 584 if (!getenv("PIDGIN_NO_DLL_CHECK")) |
| 585 #endif | 585 #endif |
| 586 dll_prep(); | 586 dll_prep(); |
| 587 | 587 |
| 588 winpidgin_set_locale(); | 588 winpidgin_set_locale(); |
| 589 /* If help or version flag used, do not check Mutex */ | 589 /* If help, version or multiple flag used, do not check Mutex */ |
| 590 if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v")) | 590 if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v") && !strstr(lpszCmdLine, "-m")) |
| 591 if (!getenv("PIDGIN_MULTI_INST") && !winpidgin_set_running()) | 591 if (!getenv("PIDGIN_MULTI_INST") && !winpidgin_set_running()) |
| 592 return 0; | 592 return 0; |
| 593 | 593 |
| 594 /* Now we are ready for Pidgin .. */ | 594 /* Now we are ready for Pidgin .. */ |
| 595 if ((hmod = LoadLibrary("pidgin.dll"))) { | 595 if ((hmod = LoadLibrary("pidgin.dll"))) { |
