mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-09 10:39:02 -04:00
Merge branch 'insp3' into master.
This commit is contained in:
commit
d5aa7ccda5
6
.github/workflows/ci-windows.yml
vendored
6
.github/workflows/ci-windows.yml
vendored
@ -13,11 +13,13 @@ jobs:
|
||||
|
||||
- name: Setup MSBuild
|
||||
uses: microsoft/setup-msbuild@v1.3.1
|
||||
with:
|
||||
msbuild-architecture: x64
|
||||
|
||||
- name: Setup Conan
|
||||
uses: turtlebrowser/get-conan@v1.2
|
||||
with:
|
||||
version: 1.59.0
|
||||
version: 1.60.1
|
||||
|
||||
- name: Install libraries
|
||||
working-directory: ${{ github.workspace }}/win/build
|
||||
@ -27,6 +29,8 @@ jobs:
|
||||
|
||||
- name: Run CMake
|
||||
working-directory: ${{ github.workspace }}/win/build
|
||||
env:
|
||||
LDFLAGS: /DEBUG:FASTLINK /INCREMENTAL
|
||||
run: |
|
||||
cmake -A x64 -G "Visual Studio 16 2019" -Wdev ..
|
||||
|
||||
|
@ -47,9 +47,7 @@ InspIRCd is licensed under [version 2 of the GNU General Public License](https:/
|
||||
* [Website](https://www.inspircd.org)
|
||||
* [Documentation](https://docs.inspircd.org)
|
||||
* [GitHub](https://github.com/inspircd)
|
||||
* [Twitter](https://twitter.com/inspircdteam)
|
||||
* [Mastodon](https://fosstodon.org/@inspircd)
|
||||
* [Cohost](https://cohost.org/inspircd)
|
||||
* [Social Media](https://docs.inspircd.org/social)
|
||||
* Support IRC channel — \#inspircd on irc.inspircd.org
|
||||
* Development IRC channel — \#inspircd.dev on irc.inspircd.org
|
||||
* InspIRCd test network — testnet.inspircd.org
|
||||
|
@ -954,7 +954,10 @@ void User::ChangeRealHost(const std::string& newhost, bool resetdisplay)
|
||||
// If we are just resetting the display host then we don't need to
|
||||
// do anything else.
|
||||
if (!changehost)
|
||||
{
|
||||
InvalidateCache();
|
||||
return;
|
||||
}
|
||||
|
||||
// Don't call the OnChangeRealHost event when initialising a user.
|
||||
const bool initializing = realhost.empty();
|
||||
|
Loading…
x
Reference in New Issue
Block a user